diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-02-22 14:48:21 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-02-22 14:48:21 +0100 |
| commit | 7c93c219b4af7d5183ca17ad4e1a1d97c53a918d (patch) | |
| tree | c0a09bce21d07422af0cbff088447d34dc92fb00 /java/src | |
| parent | Build C++11 testsuite with VS 2017 RC (diff) | |
| download | ice-7c93c219b4af7d5183ca17ad4e1a1d97c53a918d.tar.bz2 ice-7c93c219b4af7d5183ca17ad4e1a1d97c53a918d.tar.xz ice-7c93c219b4af7d5183ca17ad4e1a1d97c53a918d.zip | |
Minor IceSSL fixes
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/Ice/src/main/java/com/zeroc/IceSSL/TransceiverI.java | 47 |
1 files changed, 23 insertions, 24 deletions
diff --git a/java/src/Ice/src/main/java/com/zeroc/IceSSL/TransceiverI.java b/java/src/Ice/src/main/java/com/zeroc/IceSSL/TransceiverI.java index bb0670ebba7..b69a8858564 100644 --- a/java/src/Ice/src/main/java/com/zeroc/IceSSL/TransceiverI.java +++ b/java/src/Ice/src/main/java/com/zeroc/IceSSL/TransceiverI.java @@ -65,33 +65,32 @@ final class TransceiverI implements com.zeroc.IceInternal.Transceiver return status; } - if(_engine != null) + assert(_engine != null); + + SSLSession session = _engine.getSession(); + _cipher = session.getCipherSuite(); + try { - SSLSession session = _engine.getSession(); - _cipher = session.getCipherSuite(); - try - { - java.security.cert.Certificate[] pcerts = session.getPeerCertificates(); - java.security.cert.Certificate[] vcerts = _instance.engine().getVerifiedCertificateChain(pcerts); - _verified = vcerts != null; - _nativeCerts = _verified ? vcerts : pcerts; - java.util.ArrayList<String> certs = new java.util.ArrayList<>(); - for(java.security.cert.Certificate c : _nativeCerts) - { - StringBuilder s = new StringBuilder("-----BEGIN CERTIFICATE-----\n"); - s.append(Base64.getEncoder().encodeToString(c.getEncoded())); - s.append("\n-----END CERTIFICATE-----"); - certs.add(s.toString()); - } - _certs = certs.toArray(new String[certs.size()]); - } - catch(javax.net.ssl.SSLPeerUnverifiedException ex) - { - // No peer certificates. - } - catch(java.security.cert.CertificateEncodingException ex) + java.security.cert.Certificate[] pcerts = session.getPeerCertificates(); + java.security.cert.Certificate[] vcerts = _instance.engine().getVerifiedCertificateChain(pcerts); + _verified = vcerts != null; + _nativeCerts = _verified ? vcerts : pcerts; + java.util.ArrayList<String> certs = new java.util.ArrayList<>(); + for(java.security.cert.Certificate c : _nativeCerts) { + StringBuilder s = new StringBuilder("-----BEGIN CERTIFICATE-----\n"); + s.append(Base64.getEncoder().encodeToString(c.getEncoded())); + s.append("\n-----END CERTIFICATE-----"); + certs.add(s.toString()); } + _certs = certs.toArray(new String[certs.size()]); + } + catch(javax.net.ssl.SSLPeerUnverifiedException ex) + { + // No peer certificates. + } + catch(java.security.cert.CertificateEncodingException ex) + { } // |