diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2015-04-01 14:31:47 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2015-04-01 14:31:47 +0200 |
| commit | 89d6eaca602a360bdd5930216f2af6568154e0a5 (patch) | |
| tree | c1b7ab2ee256fb22c6b9d5ff8cc18946598dd9e7 /java/src | |
| parent | SSL fixes (diff) | |
| download | ice-89d6eaca602a360bdd5930216f2af6568154e0a5.tar.bz2 ice-89d6eaca602a360bdd5930216f2af6568154e0a5.tar.xz ice-89d6eaca602a360bdd5930216f2af6568154e0a5.zip | |
SSL fixes (bis)
- Fixed SChannel to correctly handles certificate chains from PKCS12 files
- Fixed Java IceSSL to require password for PKCS12
- Fixed Windows test build issue
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/Ice/src/main/java/IceSSL/SSLEngine.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/java/src/Ice/src/main/java/IceSSL/SSLEngine.java b/java/src/Ice/src/main/java/IceSSL/SSLEngine.java index 14b22f53747..9eb18224828 100644 --- a/java/src/Ice/src/main/java/IceSSL/SSLEngine.java +++ b/java/src/Ice/src/main/java/IceSSL/SSLEngine.java @@ -43,7 +43,7 @@ class SSLEngine { parseCiphers(ciphers); } - + String[] protocols = properties.getPropertyAsList(prefix + "Protocols"); if(protocols.length != 0) { @@ -351,9 +351,9 @@ class SSLEngine { passwordChars = _passwordCallback.getKeystorePassword(); } - else if(keystoreType.equals("BKS")) + else if(keystoreType.equals("BKS") || keystoreType.equals("PKCS12")) { - // Bouncy Castle does not permit null passwords. + // Bouncy Castle or PKCS12 does not permit null passwords. passwordChars = new char[0]; } @@ -471,9 +471,9 @@ class SSLEngine { passwordChars = _passwordCallback.getTruststorePassword(); } - else if(truststoreType.equals("BKS")) + else if(truststoreType.equals("BKS") || truststoreType.equals("PKCS12")) { - // Bouncy Castle does not permit null passwords. + // Bouncy Castle or PKCS12 does not permit null passwords. passwordChars = new char[0]; } @@ -690,7 +690,7 @@ class SSLEngine protocols.remove("SSLv3"); engine.setEnabledProtocols(protocols.toArray(new String[protocols.size()])); } - + if(incoming) { |