diff options
| author | Mark Spruiell <mes@zeroc.com> | 2012-11-26 14:14:39 -0800 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2012-11-26 14:14:39 -0800 |
| commit | 74c402e72c8bc7a0cf030603192fe1a03d333dd8 (patch) | |
| tree | 6ea06ab1b8a257a1360d52610f77d9c67bcd250e /java/src/IceSSL/Instance.java | |
| parent | Fixed build failure on Solaris CC (diff) | |
| download | ice-74c402e72c8bc7a0cf030603192fe1a03d333dd8.tar.bz2 ice-74c402e72c8bc7a0cf030603192fe1a03d333dd8.tar.xz ice-74c402e72c8bc7a0cf030603192fe1a03d333dd8.zip | |
ICE-4987 - IceSSL test failure
Diffstat (limited to 'java/src/IceSSL/Instance.java')
| -rw-r--r-- | java/src/IceSSL/Instance.java | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/java/src/IceSSL/Instance.java b/java/src/IceSSL/Instance.java index b98cd2da068..b6320343a82 100644 --- a/java/src/IceSSL/Instance.java +++ b/java/src/IceSSL/Instance.java @@ -65,10 +65,19 @@ class Instance { l.add("SSLv3"); } - else if(s.equals("tls") || s.equals("tls1") || s.equals("tlsv1")) + else if(s.equals("tls") || s.equals("tls1") || s.equals("tlsv1") || s.equals("tls1_0") || + s.equals("tlsv1_0")) { l.add("TLSv1"); } + else if(s.equals("tls1_1") || s.equals("tlsv1_1")) + { + l.add("TLSv1.1"); + } + else if(s.equals("tls1_2") || s.equals("tlsv1_2")) + { + l.add("TLSv1.2"); + } else { Ice.PluginInitializationException e = new Ice.PluginInitializationException(); |