diff options
| author | Jose <jose@zeroc.com> | 2019-09-06 18:49:02 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2019-09-06 18:52:30 +0200 |
| commit | f77a9b7847525d56ba64a0631652401885457a9e (patch) | |
| tree | a3283476120c498a6e28bc0712d51886e64125e3 /java-compat | |
| parent | Mark SNI support in UWP as not tested (diff) | |
| download | ice-f77a9b7847525d56ba64a0631652401885457a9e.tar.bz2 ice-f77a9b7847525d56ba64a0631652401885457a9e.tar.xz ice-f77a9b7847525d56ba64a0631652401885457a9e.zip | |
Enable SNI extension with CheckCertName > 1
- Remove IceSSL.ServerNameIndication, IceSSL.CheckCertName = 2 should be used
instead.
- Minor style fixes
Diffstat (limited to 'java-compat')
| -rw-r--r-- | java-compat/src/Ice/src/main/java/IceInternal/PropertyNames.java | 3 | ||||
| -rw-r--r-- | java-compat/src/Ice/src/main/java/IceSSL/SSLEngine.java | 4 |
2 files changed, 1 insertions, 6 deletions
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/PropertyNames.java b/java-compat/src/Ice/src/main/java/IceInternal/PropertyNames.java index 69776d6a876..36daa5282b8 100644 --- a/java-compat/src/Ice/src/main/java/IceInternal/PropertyNames.java +++ b/java-compat/src/Ice/src/main/java/IceInternal/PropertyNames.java @@ -1,7 +1,7 @@ // // Copyright (c) ZeroC, Inc. All rights reserved. // -// Generated by makeprops.py from file ./config/PropertyNames.xml, Mon Aug 19 09:05:47 2019 +// Generated by makeprops.py from file ./config/PropertyNames.xml, Fri Sep 6 18:11:04 2019 // IMPORTANT: Do not edit this file -- any edits made here will be lost! @@ -1118,7 +1118,6 @@ public final class PropertyNames new Property("IceSSL\\.ProtocolVersionMin", false, null), new Property("IceSSL\\.Random", false, null), new Property("IceSSL\\.SchannelStrongCrypto", false, null), - new Property("IceSSL\\.ServerNameIndication", false, null), new Property("IceSSL\\.Trace\\.Security", false, null), new Property("IceSSL\\.TrustOnly", false, null), new Property("IceSSL\\.TrustOnly\\.Client", false, null), diff --git a/java-compat/src/Ice/src/main/java/IceSSL/SSLEngine.java b/java-compat/src/Ice/src/main/java/IceSSL/SSLEngine.java index 3a874b4adcc..53a0dfa6539 100644 --- a/java-compat/src/Ice/src/main/java/IceSSL/SSLEngine.java +++ b/java-compat/src/Ice/src/main/java/IceSSL/SSLEngine.java @@ -872,10 +872,6 @@ class SSLEngine } } - // SNI support: Java prior to version 8 do not have this feature in the SSLParameters - // class (https://docs.oracle.com/javase/7/docs/api/javax/net/ssl/SSLParameters.html). - // Therefore, Ice java-compat does not support SNI. - try { engine.beginHandshake(); |