1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
|
--- cpp/test/IceSSL/configuration/AllTests.cpp.orig 2015-06-23 15:30:20.000000000 +0000
+++ cpp/test/IceSSL/configuration/AllTests.cpp 2015-09-15 00:15:34.865304987 +0000
@@ -7,6 +7,7 @@
//
// **********************************************************************
+#include <openssl/ssl.h>
#include <Ice/Ice.h>
#include <IceSSL/Plugin.h>
#include <TestCommon.h>
@@ -1292,14 +1293,22 @@
InitializationData initData;
initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "c_rsa_ca1", "cacert1");
initData.properties->setProperty("IceSSL.VerifyPeer", "0");
+# ifdef SSL_TXT_TLSV1_1
+ initData.properties->setProperty("IceSSL.Protocols", "tlsv1_1");
+# else
initData.properties->setProperty("IceSSL.Protocols", "ssl3");
+# endif
CommunicatorPtr comm = initialize(initData);
Test::ServerFactoryPrx fact = Test::ServerFactoryPrx::checkedCast(comm->stringToProxy(factoryRef));
test(fact);
Test::Properties d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca1", "cacert1");
d["IceSSL.VerifyPeer"] = "0";
+# ifdef SSL_TXT_TLSV1_1
+ d["IceSSL.Protocols"] = "tlsv1_0";
+# else
d["IceSSL.Protocols"] = "tls";
+# endif
Test::ServerPrx server = fact->createServer(d);
try
{
@@ -1329,7 +1340,11 @@
test(fact);
d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca1", "cacert1");
d["IceSSL.VerifyPeer"] = "0";
+# ifdef SSL_TXT_TLSV1_1
+ d["IceSSL.Protocols"] = "tlsv1_1, tlsv1_0";
+# else
d["IceSSL.Protocols"] = "tls, ssl3";
+# endif
server = fact->createServer(d);
try
{
@@ -1351,6 +1362,7 @@
InitializationData initData;
initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "c_rsa_ca1", "cacert1");
initData.properties->setProperty("IceSSL.VerifyPeer", "0");
+ // on modern openssl this simply fails as ssl3 is not supported by the client
initData.properties->setProperty("IceSSL.Protocols", "ssl3");
CommunicatorPtr comm = initialize(initData);
@@ -1386,14 +1398,22 @@
{
InitializationData initData;
initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "", "cacert1");
+# ifdef SSL_TXT_TLSV1_1
+ initData.properties->setProperty("IceSSL.Protocols", "tlsv1_1");
+# else
initData.properties->setProperty("IceSSL.Protocols", "ssl3");
+# endif
CommunicatorPtr comm = initialize(initData);
Test::ServerFactoryPrx fact = Test::ServerFactoryPrx::checkedCast(comm->stringToProxy(factoryRef));
test(fact);
Test::Properties d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca1", "");
d["IceSSL.VerifyPeer"] = "0";
+# ifdef SSL_TXT_TLSV1_1
+ d["IceSSL.Protocols"] = "tls, tls1_1, tls1_2";
+# else
d["IceSSL.Protocols"] = "ssl3, tls, tls1_1, tls1_2";
+# endif
Test::ServerPrx server = fact->createServer(d);
try
{
@@ -3164,6 +3184,7 @@
#endif
}
+#if 0 // we don't want to talk to zeroc while building
cout << "testing system CAs... " << flush;
{
InitializationData initData;
@@ -3208,6 +3229,7 @@
comm->destroy();
}
cout << "ok" << endl;
+#endif
if(shutdown)
{
|
