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