You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2018/10/05 15:16:54 UTC
[cxf] 01/03: Remove default ciphersuite filter inclusion (which
isn't used anyway)
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 57b7cd196db37ccede566a9fb89d6c160769dcd7
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Fri Oct 5 10:56:21 2018 +0100
Remove default ciphersuite filter inclusion (which isn't used anyway)
(cherry picked from commit 86d7c657499b73bdbbd6ba9f1579e76ca0715357)
---
core/src/main/java/org/apache/cxf/configuration/jsse/SSLUtils.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/core/src/main/java/org/apache/cxf/configuration/jsse/SSLUtils.java b/core/src/main/java/org/apache/cxf/configuration/jsse/SSLUtils.java
index a974159..62c660b 100644
--- a/core/src/main/java/org/apache/cxf/configuration/jsse/SSLUtils.java
+++ b/core/src/main/java/org/apache/cxf/configuration/jsse/SSLUtils.java
@@ -31,6 +31,7 @@ import java.security.KeyStore;
import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -66,8 +67,6 @@ public final class SSLUtils {
private static final String HTTPS_CIPHER_SUITES = "https.cipherSuites";
- private static final List<String> DEFAULT_CIPHERSUITE_FILTERS_INCLUDE =
- Arrays.asList(new String[] {".*"});
/**
* By default, exclude NULL, anon, EXPORT, DES ciphersuites
*/
@@ -406,7 +405,7 @@ public final class SSLUtils {
List<Pattern> includes =
filters != null
? compileRegexPatterns(filters.getInclude(), true, log)
- : compileRegexPatterns(DEFAULT_CIPHERSUITE_FILTERS_INCLUDE, true, log);
+ : Collections.emptyList();
List<Pattern> excludes =
filters != null
? compileRegexPatterns(filters.getExclude(), false, log)