diff options
| author | Endi S. Dewata <edewata@redhat.com> | 2017-03-17 02:01:20 +0100 |
|---|---|---|
| committer | Endi S. Dewata <edewata@redhat.com> | 2017-03-17 16:17:03 +0100 |
| commit | 4d6e6d05d5270a0e81ae12e2583cae9c49667c88 (patch) | |
| tree | 474a48ab4a679ed6e55a5c2f8ccd4fb6c8e01cab /base/common | |
| parent | 9c0fb168900913a8249745a0185af1859c715571 (diff) | |
| download | pki-4d6e6d05d5270a0e81ae12e2583cae9c49667c88.tar.gz pki-4d6e6d05d5270a0e81ae12e2583cae9c49667c88.tar.xz pki-4d6e6d05d5270a0e81ae12e2583cae9c49667c88.zip | |
Removed duplicate code to configure SSL version ranges.
The duplicate code for configuring default SSL version ranges has
been merged into reusable methods in CryptoUtil.
Diffstat (limited to 'base/common')
| -rw-r--r-- | base/common/src/com/netscape/certsrv/client/PKIConnection.java | 27 |
1 files changed, 6 insertions, 21 deletions
diff --git a/base/common/src/com/netscape/certsrv/client/PKIConnection.java b/base/common/src/com/netscape/certsrv/client/PKIConnection.java index 301c4c69b..2c979eac2 100644 --- a/base/common/src/com/netscape/certsrv/client/PKIConnection.java +++ b/base/common/src/com/netscape/certsrv/client/PKIConnection.java @@ -84,7 +84,7 @@ import org.mozilla.jss.ssl.SSLSocket; import com.netscape.certsrv.base.PKIException; import com.netscape.cmsutil.crypto.CryptoUtil; - +import com.netscape.cmsutil.crypto.CryptoUtil.SSLVersion; public class PKIConnection { @@ -332,24 +332,8 @@ public class PKIConnection { localAddr = localAddress.getAddress(); } - org.mozilla.jss.ssl.SSLSocket.SSLVersionRange stream_range = - new org.mozilla.jss.ssl.SSLSocket.SSLVersionRange( - org.mozilla.jss.ssl.SSLSocket.SSLVersionRange.tls1_0, - org.mozilla.jss.ssl.SSLSocket.SSLVersionRange.tls1_2); - - SSLSocket.setSSLVersionRangeDefault( - org.mozilla.jss.ssl.SSLSocket.SSLProtocolVariant.STREAM, - stream_range); - - org.mozilla.jss.ssl.SSLSocket.SSLVersionRange datagram_range = - new org.mozilla.jss.ssl.SSLSocket.SSLVersionRange( - org.mozilla.jss.ssl.SSLSocket.SSLVersionRange.tls1_1, - org.mozilla.jss.ssl.SSLSocket.SSLVersionRange.tls1_2); - - SSLSocket.setSSLVersionRangeDefault( - org.mozilla.jss.ssl.SSLSocket.SSLProtocolVariant.DATA_GRAM, - datagram_range); - + CryptoUtil.setSSLStreamVersionRange(SSLVersion.TLS_1_0, SSLVersion.TLS_1_2); + CryptoUtil.setSSLDatagramVersionRange(SSLVersion.TLS_1_1, SSLVersion.TLS_1_2); CryptoUtil.setClientCiphers(); SSLSocket socket; @@ -364,8 +348,9 @@ public class PKIConnection { } else { socket = new SSLSocket(sock, hostName, callback, null); } -// setSSLVersionRange needs to be exposed in jss -// socket.setSSLVersionRange(org.mozilla.jss.ssl.SSLSocket.SSLVersionRange.tls1_0, org.mozilla.jss.ssl.SSLSocket.SSLVersionRange.tls1_2); + + // SSLSocket.setSSLVersionRange() needs to be exposed in JSS + // socket.setSSLVersionRange(SSLVersionRange.tls1_0, SSLVersionRange.tls1_2); String certNickname = config.getCertNickname(); if (certNickname != null) { |