RenJuan
/
DRDE
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

*

This commit is contained in:
Ren RenJuan 2014-01-16 05:10:28 +00:00
parent 8054bef18d
commit a31c00607f
4 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ACTK1_0/session/TLSSocket.cpp
View File

@ -7,6 +7,18 @@
#include <unistd.h> #include <unistd.h>
#include <netinet/in.h> // htonl #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 char *otePeer;
extern const int tkScenario; extern const int tkScenario;
@ -41,7 +53,7 @@ TLSSocket::TLSSocket(SSL_CTX* ctx, int sock, const string& host,
throw e; throw e;
} }
if (tkScenario == 1 || tkScenario ==2) commonName = otePeer; if (tkScenario >= ACTK_INSECURE && tkScenario < ACTK_PROD) commonName = otePeer;
else { else {
if ((ret = SSL_get_verify_result(ssl)) != X509_V_OK) if ((ret = SSL_get_verify_result(ssl)) != X509_V_OK)

3
AusRegCliever/Makefile
View File

@ -1,5 +1,5 @@
LOCATION=DEBIAN_7 LOCATION=DEBIAN_7
ARTKENABLED=0 ARTKENABLED=132
#LOCATION=DEBIAN_6 #LOCATION=DEBIAN_6
#LOCATION=OSX_10_8 #LOCATION=OSX_10_8
# #
@ -20,6 +20,7 @@ ifneq ($(ARTKENABLED),0)
ARTKINCL=-I/home/jdaugherty/clients/reg.de/git/ACTK1_0 ARTKINCL=-I/home/jdaugherty/clients/reg.de/git/ACTK1_0
endif endif
endif endif
ifeq ($(LOCATION),DEBIAN_6) ifeq ($(LOCATION),DEBIAN_6)
ARTKLIB=-L/home/jdaugherty/dnseppus/ACTK1_0/lib ARTKLIB=-L/home/jdaugherty/dnseppus/ACTK1_0/lib
ARTKINCL=-I/home/jdaugherty/dnseppus/ACTK1_0 ARTKINCL=-I/home/jdaugherty/dnseppus/ACTK1_0

4
AusRegCliever/include/ausRegTK.h
View File

@ -25,9 +25,9 @@ class ausRegEPPTK {
public: int tkScenario; public: int tkScenario;
int daysRunning; 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; daysRunning = 0;
} }
bool didInit(const std::string propertiesFilePath); bool didInit(const std::string propertiesFilePath);

2
AusRegCliever/include/mdcommon.h
View File

@ -140,6 +140,7 @@ enum mdDGtype {
N_MDDG_TYPES N_MDDG_TYPES
}; };
#ifndef acTKScenario
enum acTKScenario { enum acTKScenario {
ACTK_ALONE = 0, ACTK_ALONE = 0,
ACTK_INSECURE, ACTK_INSECURE,
@ -149,6 +150,7 @@ enum acTKScenario {
ACTK_PROD, ACTK_PROD,
N_ACTK_SCENARIOS N_ACTK_SCENARIOS
}; };
#endif
typedef typedef
struct MD_DG_TYPE { struct MD_DG_TYPE {