The setClientCiphers() in CryptoUtil has been renamed to setDefaultSSLCiphers() for clarity.
Pushed to master under trivial rule. -- Endi S. Dewata
>From a168db3f36584a6a576daa91c993d18c134835fe Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" <edew...@redhat.com> Date: Sun, 19 Mar 2017 18:44:06 +0100 Subject: [PATCH] Renamed CryptoUtil.setClientCiphers(). The setClientCiphers() in CryptoUtil has been renamed to setDefaultSSLCiphers() for clarity. --- .../src/com/netscape/admin/certsrv/connection/JSSConnection.java | 2 +- base/java-tools/src/com/netscape/cmstools/HttpClient.java | 2 +- base/java-tools/src/com/netscape/cmstools/cli/MainCLI.java | 2 +- base/util/src/com/netscape/cmsutil/crypto/CryptoUtil.java | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/base/console/src/com/netscape/admin/certsrv/connection/JSSConnection.java b/base/console/src/com/netscape/admin/certsrv/connection/JSSConnection.java index 8678b537886bc28b1ec81f9f61be8337b2f8c00f..5513155051d24c12e6c83a8aef5c2fd1b2cca6f4 100644 --- a/base/console/src/com/netscape/admin/certsrv/connection/JSSConnection.java +++ b/base/console/src/com/netscape/admin/certsrv/connection/JSSConnection.java @@ -121,7 +121,7 @@ public class JSSConnection implements IConnection, SSLCertificateApprovalCallbac CryptoUtil.setSSLStreamVersionRange(SSLVersion.TLS_1_0, SSLVersion.TLS_1_2); CryptoUtil.setSSLDatagramVersionRange(SSLVersion.TLS_1_1, SSLVersion.TLS_1_2); - CryptoUtil.setClientCiphers(); + CryptoUtil.setDefaultSSLCiphers(); s = new SSLSocket(host, port, null, 0, this, this); diff --git a/base/java-tools/src/com/netscape/cmstools/HttpClient.java b/base/java-tools/src/com/netscape/cmstools/HttpClient.java index aa3bd174385c4fa6a04ac5ce330a5a0d54b6973a..29b7446b4b6785b427affb511dd4d3d0d5d9d4e2 100644 --- a/base/java-tools/src/com/netscape/cmstools/HttpClient.java +++ b/base/java-tools/src/com/netscape/cmstools/HttpClient.java @@ -126,7 +126,7 @@ public class HttpClient { CryptoUtil.setSSLStreamVersionRange(SSLVersion.TLS_1_0, SSLVersion.TLS_1_2); CryptoUtil.setSSLDatagramVersionRange(SSLVersion.TLS_1_1, SSLVersion.TLS_1_2); - CryptoUtil.setClientCiphers(); + CryptoUtil.setDefaultSSLCiphers(); sslSocket = new SSLSocket(_host, _port); // SSLSocket.setSSLVersionRange() needs to be exposed in JSS 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 b3de8757f2fbf46a6a9cfdb6b770e20830037a2c..f2e0d08d948381421ee69d1cde2eb035a5a6467b 100644 --- a/base/java-tools/src/com/netscape/cmstools/cli/MainCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/cli/MainCLI.java @@ -537,7 +537,7 @@ public class MainCLI extends CLI { SSLVersion.valueOf(datagramVersionMax) ); - CryptoUtil.setClientCiphers(); + CryptoUtil.setDefaultSSLCiphers(); } public PKIClient getClient() throws Exception { diff --git a/base/util/src/com/netscape/cmsutil/crypto/CryptoUtil.java b/base/util/src/com/netscape/cmsutil/crypto/CryptoUtil.java index fccda69e4789ffbc4285099b2847a8aafdd2a694..17d314a010a8ba3e4c30e41c8816c14979cfb86a 100644 --- a/base/util/src/com/netscape/cmsutil/crypto/CryptoUtil.java +++ b/base/util/src/com/netscape/cmsutil/crypto/CryptoUtil.java @@ -932,7 +932,7 @@ public class CryptoUtil { if (list == null) { // use default - setClientCiphers(); + setDefaultSSLCiphers(); return; } @@ -950,7 +950,7 @@ public class CryptoUtil { } } - public static void setClientCiphers() throws SocketException { + public static void setDefaultSSLCiphers() throws SocketException { int ciphers[] = SSLSocket.getImplementedCipherSuites(); if (ciphers == null) return; -- 2.9.3
_______________________________________________ Pki-devel mailing list Pki-devel@redhat.com https://www.redhat.com/mailman/listinfo/pki-devel