From 31683301b69fda23893c80af7c34c42a75e1b906 Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" Date: Fri, 17 Mar 2017 19:20:30 +0100 Subject: Added configuration parameters for SSL version ranges. The hard-coded SSL version ranges in PKI CLI have been converted into configurable parameters in the pki.conf. --- .../src/com/netscape/cmstools/cli/MainCLI.java | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) (limited to 'base/java-tools/src/com') diff --git a/base/java-tools/src/com/netscape/cmstools/cli/MainCLI.java b/base/java-tools/src/com/netscape/cmstools/cli/MainCLI.java index 8f575dbf7..b3de8757f 100644 --- a/base/java-tools/src/com/netscape/cmstools/cli/MainCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/cli/MainCLI.java @@ -519,8 +519,24 @@ public class MainCLI extends CLI { } - CryptoUtil.setSSLStreamVersionRange(SSLVersion.TLS_1_0, SSLVersion.TLS_1_2); - CryptoUtil.setSSLDatagramVersionRange(SSLVersion.TLS_1_1, SSLVersion.TLS_1_2); + // See default SSL configuration in /usr/share/pki/etc/pki.conf. + + String streamVersionMin = System.getenv("SSL_STREAM_VERSION_MIN"); + String streamVersionMax = System.getenv("SSL_STREAM_VERSION_MAX"); + + CryptoUtil.setSSLStreamVersionRange( + SSLVersion.valueOf(streamVersionMin), + SSLVersion.valueOf(streamVersionMax) + ); + + String datagramVersionMin = System.getenv("SSL_DATAGRAM_VERSION_MIN"); + String datagramVersionMax = System.getenv("SSL_DATAGRAM_VERSION_MAX"); + + CryptoUtil.setSSLDatagramVersionRange( + SSLVersion.valueOf(datagramVersionMin), + SSLVersion.valueOf(datagramVersionMax) + ); + CryptoUtil.setClientCiphers(); } -- cgit