From a31c00607f9da4f335d2387ad4405b33a0cf6f23 Mon Sep 17 00:00:00 2001
From: Ren RenJuan <jdaugherty@noojuan.thoughtcrime.biz>
Date: Thu, 16 Jan 2014 05:10:28 +0000
Subject: [PATCH] *

---
 ACTK1_0/session/TLSSocket.cpp    | 14 +++++++++++++-
 AusRegCliever/Makefile           |  3 ++-
 AusRegCliever/include/ausRegTK.h |  4 ++--
 AusRegCliever/include/mdcommon.h |  2 ++
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/ACTK1_0/session/TLSSocket.cpp b/ACTK1_0/session/TLSSocket.cpp
index 3cedd0a..9424ea5 100644
--- a/ACTK1_0/session/TLSSocket.cpp
+++ b/ACTK1_0/session/TLSSocket.cpp
@@ -7,6 +7,18 @@
 #include <unistd.h>
 #include <netinet/in.h>  // htonl
 
+#ifndef acTKScenario
+enum acTKScenario {
+  ACTK_ALONE = 0,
+  ACTK_INSECURE,
+  ACTK_OTEA,
+  ACTK_OTEB,
+  ACTK_OTEC,
+  ACTK_PROD,
+  N_ACTK_SCENARIOS
+};
+#endif
+
 extern char     *otePeer;
 extern const int tkScenario;
 
@@ -41,7 +53,7 @@ TLSSocket::TLSSocket(SSL_CTX* ctx, int sock, const string& host,
 		throw e;
 	}
 
-	if (tkScenario == 1 || tkScenario ==2) commonName = otePeer;
+	if (tkScenario >= ACTK_INSECURE && tkScenario < ACTK_PROD) commonName = otePeer;
 	else {
 
 	if ((ret = SSL_get_verify_result(ssl)) != X509_V_OK)
diff --git a/AusRegCliever/Makefile b/AusRegCliever/Makefile
index 6c1161c..eb09f5b 100644
--- a/AusRegCliever/Makefile
+++ b/AusRegCliever/Makefile
@@ -1,5 +1,5 @@
 LOCATION=DEBIAN_7
-ARTKENABLED=0
+ARTKENABLED=132
 #LOCATION=DEBIAN_6
 #LOCATION=OSX_10_8
 #
@@ -20,6 +20,7 @@ ifneq ($(ARTKENABLED),0)
  ARTKINCL=-I/home/jdaugherty/clients/reg.de/git/ACTK1_0
 endif
 endif
+
 ifeq ($(LOCATION),DEBIAN_6)
  ARTKLIB=-L/home/jdaugherty/dnseppus/ACTK1_0/lib
  ARTKINCL=-I/home/jdaugherty/dnseppus/ACTK1_0
diff --git a/AusRegCliever/include/ausRegTK.h b/AusRegCliever/include/ausRegTK.h
index e37d366..86c60e9 100644
--- a/AusRegCliever/include/ausRegTK.h
+++ b/AusRegCliever/include/ausRegTK.h
@@ -25,9 +25,9 @@ class ausRegEPPTK {
   public: int tkScenario;
           int daysRunning;
 
-   // See the Toolkit Overview. At this level supposedly it can do everything.
+   // See the Toolkit Overview. At tkScenario zeo supposedly it can do everything.
 
-   ausRegEPPTK() { tkScenario  = ACTK_OTE8;
+   ausRegEPPTK() { tkScenario  = ACTK_OTEB;
                    daysRunning = 0;
    }
    bool didInit(const std::string propertiesFilePath);
diff --git a/AusRegCliever/include/mdcommon.h b/AusRegCliever/include/mdcommon.h
index 7266a0f..1c2e2da 100644
--- a/AusRegCliever/include/mdcommon.h
+++ b/AusRegCliever/include/mdcommon.h
@@ -140,6 +140,7 @@ enum mdDGtype {
   N_MDDG_TYPES
 };
 
+#ifndef acTKScenario
 enum acTKScenario {
   ACTK_ALONE = 0,
   ACTK_INSECURE,
@@ -149,6 +150,7 @@ enum acTKScenario {
   ACTK_PROD,
   N_ACTK_SCENARIOS
 };
+#endif
 
 typedef
 struct MD_DG_TYPE {