camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject camel git commit: Disable DES + Export CipherSuites by default as well
Date Tue, 18 Aug 2015 11:37:26 GMT
Repository: camel
Updated Branches:
  refs/heads/camel-2.15.x 0622ad689 -> 11c439ae2


Disable DES + Export CipherSuites by default as well


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/11c439ae
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/11c439ae
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/11c439ae

Branch: refs/heads/camel-2.15.x
Commit: 11c439ae2973765bde76c6f8478d847257f63fc5
Parents: 0622ad6
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Tue Aug 18 12:36:22 2015 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Tue Aug 18 12:37:19 2015 +0100

----------------------------------------------------------------------
 .../java/org/apache/camel/util/jsse/BaseSSLContextParameters.java | 2 +-
 .../java/org/apache/camel/util/jsse/SSLContextParametersTest.java | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/11c439ae/camel-core/src/main/java/org/apache/camel/util/jsse/BaseSSLContextParameters.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/util/jsse/BaseSSLContextParameters.java
b/camel-core/src/main/java/org/apache/camel/util/jsse/BaseSSLContextParameters.java
index 1bb807f..0554067 100644
--- a/camel-core/src/main/java/org/apache/camel/util/jsse/BaseSSLContextParameters.java
+++ b/camel-core/src/main/java/org/apache/camel/util/jsse/BaseSSLContextParameters.java
@@ -61,7 +61,7 @@ public abstract class BaseSSLContextParameters extends JsseParameters {
         Collections.unmodifiableList(Arrays.asList(".*"));
     
     protected static final List<String> DEFAULT_CIPHER_SUITES_FILTER_EXCLUDE =
-        Collections.unmodifiableList(Arrays.asList(".*_NULL_.*", ".*_anon_.*"));
+        Collections.unmodifiableList(Arrays.asList(".*_NULL_.*", ".*_anon_.*", ".*_EXPORT_.*",
".*_DES_.*"));
     
     protected static final List<String> DEFAULT_SECURE_SOCKET_PROTOCOLS_FILTER_INCLUDE
=
         Collections.unmodifiableList(Arrays.asList(".*"));

http://git-wip-us.apache.org/repos/asf/camel/blob/11c439ae/camel-core/src/test/java/org/apache/camel/util/jsse/SSLContextParametersTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/util/jsse/SSLContextParametersTest.java
b/camel-core/src/test/java/org/apache/camel/util/jsse/SSLContextParametersTest.java
index a51972e..0247a4d 100644
--- a/camel-core/src/test/java/org/apache/camel/util/jsse/SSLContextParametersTest.java
+++ b/camel-core/src/test/java/org/apache/camel/util/jsse/SSLContextParametersTest.java
@@ -812,7 +812,8 @@ public class SSLContextParametersTest extends AbstractJsseParametersTest
{
         List<String> enabled = new LinkedList<String>();
         
         for (String string : availableCipherSuites) {
-            if (!string.contains("_anon_") && !string.contains("_NULL_")) {
+            if (!string.contains("_anon_") && !string.contains("_NULL_")
+                && !string.contains("_EXPORT_") && !string.contains("_DES_"))
{
                 enabled.add(string);
             }
         }


Mime
View raw message