diff options
Diffstat (limited to 'java/ssl/jdk1.5/IceSSL/Instance.java')
| -rw-r--r-- | java/ssl/jdk1.5/IceSSL/Instance.java | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/java/ssl/jdk1.5/IceSSL/Instance.java b/java/ssl/jdk1.5/IceSSL/Instance.java index 0554e25c011..55459a14f3f 100644 --- a/java/ssl/jdk1.5/IceSSL/Instance.java +++ b/java/ssl/jdk1.5/IceSSL/Instance.java @@ -266,7 +266,7 @@ class Instance for(int i = 0; i < keyManagers.length; ++i) { - keyManagers[i] = new KeyManagerI((javax.net.ssl.X509KeyManager)keyManagers[i], alias); + keyManagers[i] = new X509KeyManagerI((javax.net.ssl.X509KeyManager)keyManagers[i], alias); } } } @@ -311,6 +311,23 @@ class Instance } // + // The default TrustManager implementation in IBM's JDK does not accept + // anonymous ciphers, so we have to install our own. + // + if(trustManagers == null) + { + trustManagers = new javax.net.ssl.TrustManager[1]; + trustManagers[0] = new X509TrustManagerI(null); + } + else + { + for(int i = 0; i < trustManagers.length; ++i) + { + trustManagers[i] = new X509TrustManagerI((javax.net.ssl.X509TrustManager)trustManagers[i]); + } + } + + // // Initialize the SSL context. // _context = javax.net.ssl.SSLContext.getInstance("SSL"); |