summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDwayne Boone <dwayne@zeroc.com>2014-10-08 11:07:42 -0230
committerDwayne Boone <dwayne@zeroc.com>2014-10-08 11:07:42 -0230
commit22a63576b7495e311aab080dd9a4594a38fab786 (patch)
tree363b78cb88ef8d14844e67cd6650bbc0568f92fb
parentAdded CHANGES entry for "java:buffer" metadta (diff)
downloadice-22a63576b7495e311aab080dd9a4594a38fab786.tar.bz2
ice-22a63576b7495e311aab080dd9a4594a38fab786.tar.xz
ice-22a63576b7495e311aab080dd9a4594a38fab786.zip
ICE-5719 java Glacier2/callback demo SSL handshake failure
-rw-r--r--java/demo/Glacier2/callback/config.glacier23
1 files changed, 3 insertions, 0 deletions
diff --git a/java/demo/Glacier2/callback/config.glacier2 b/java/demo/Glacier2/callback/config.glacier2
index ff9a3550c2c..e455a50667d 100644
--- a/java/demo/Glacier2/callback/config.glacier2
+++ b/java/demo/Glacier2/callback/config.glacier2
@@ -126,3 +126,6 @@ IceSSL.DefaultDir=../../../../certs
IceSSL.CertAuthFile=cacert.pem
IceSSL.CertFile=s_rsa1024_pub.pem
IceSSL.KeyFile=s_rsa1024_priv.pem
+
+# Required for a Java 1.8 client to talk to a C++ server on OSX
+IceSSL.ProtocolVersionMax=tls1_1