diff options
| author | Mark Spruiell <mes@zeroc.com> | 2013-08-23 12:12:22 -0700 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2013-08-23 12:12:22 -0700 |
| commit | a2e8423972ea3e31585d01f7ebad0602b5cfd34d (patch) | |
| tree | d0446a2fb93772d10dc65a8958be40b0910897ae /java/src/IceSSL/X509TrustManagerI.java | |
| parent | enabling .NET policy files for 3.5.1 (diff) | |
| download | ice-a2e8423972ea3e31585d01f7ebad0602b5cfd34d.tar.bz2 ice-a2e8423972ea3e31585d01f7ebad0602b5cfd34d.tar.xz ice-a2e8423972ea3e31585d01f7ebad0602b5cfd34d.zip | |
ICE-5404 - IceSSL test failure on SLES11SP3
Diffstat (limited to 'java/src/IceSSL/X509TrustManagerI.java')
| -rw-r--r-- | java/src/IceSSL/X509TrustManagerI.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/java/src/IceSSL/X509TrustManagerI.java b/java/src/IceSSL/X509TrustManagerI.java index 7a739420761..a76cb9c0839 100644 --- a/java/src/IceSSL/X509TrustManagerI.java +++ b/java/src/IceSSL/X509TrustManagerI.java @@ -24,7 +24,9 @@ final class X509TrustManagerI implements javax.net.ssl.X509TrustManager // // Do not invoke the wrapped trust manager for anonymous ciphers. // - if(!authType.equals("DH_anon")) + // Possible values for authType are "DH_anon" and "ECDH_anon" (IBM JDK). + // + if(authType.indexOf("DH_anon") == -1) { try { @@ -44,7 +46,9 @@ final class X509TrustManagerI implements javax.net.ssl.X509TrustManager // // Do not invoke the wrapped trust manager for anonymous ciphers. // - if(!authType.equals("DH_anon")) + // Possible values for authType are "DH_anon" and "ECDH_anon" (IBM JDK). + // + if(authType.indexOf("DH_anon") == -1) { try { |