You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by co...@apache.org on 2015/08/18 13:36:47 UTC
camel git commit: Disable DES + Export CipherSuites by default as well
Repository: camel
Updated Branches:
refs/heads/master fae98f51d -> 1798974a6
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/1798974a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1798974a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1798974a
Branch: refs/heads/master
Commit: 1798974a64eb54c46c0ffb4034adf73e62d4e260
Parents: fae98f5
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Tue Aug 18 12:36:22 2015 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Tue Aug 18 12:36:22 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/1798974a/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/1798974a/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);
}
}