Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 352A8109E8 for ; Wed, 10 Dec 2014 16:21:53 +0000 (UTC) Received: (qmail 40595 invoked by uid 500); 10 Dec 2014 16:21:53 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 40532 invoked by uid 500); 10 Dec 2014 16:21:53 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 40425 invoked by uid 99); 10 Dec 2014 16:21:53 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 10 Dec 2014 16:21:53 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id C7E6BA23DE5; Wed, 10 Dec 2014 16:21:51 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: coheigea@apache.org To: commits@cxf.apache.org Date: Wed, 10 Dec 2014 16:21:51 -0000 Message-Id: <4179327438b44eb68bc34f93168eecc4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/5] cxf git commit: Backmerging cipher suite change Repository: cxf Updated Branches: refs/heads/3.0.x-fixes 877c386dc -> dc8a99dd8 Backmerging cipher suite change Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/0fafa8c7 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/0fafa8c7 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/0fafa8c7 Branch: refs/heads/3.0.x-fixes Commit: 0fafa8c78969bb4b0f34a39e002fcb8975879db3 Parents: 877c386 Author: Colm O hEigeartaigh Authored: Wed Dec 10 15:00:12 2014 +0000 Committer: Colm O hEigeartaigh Committed: Wed Dec 10 15:00:12 2014 +0000 ---------------------------------------------------------------------- .../java/org/apache/cxf/configuration/jsse/SSLUtils.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/0fafa8c7/core/src/main/java/org/apache/cxf/configuration/jsse/SSLUtils.java ---------------------------------------------------------------------- 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 396d53c..534c256 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 @@ -68,14 +68,16 @@ public final class SSLUtils { private static final boolean DEFAULT_REQUIRE_CLIENT_AUTHENTICATION = false; private static final boolean DEFAULT_WANT_CLIENT_AUTHENTICATION = true; - /** - * By default, only include export-compatible ciphersuites. - */ private static final List DEFAULT_CIPHERSUITE_FILTERS_INCLUDE = Arrays.asList(new String[] {".*"}); + /** + * By default, exclude NULL, anon, EXPORT, DES ciphersuites + */ private static final List DEFAULT_CIPHERSUITE_FILTERS_EXCLUDE = Arrays.asList(new String[] {".*_NULL_.*", - ".*_anon_.*"}); + ".*_anon_.*", + ".*_EXPORT_.*", + ".*_DES_.*"}); private static volatile KeyManager[] defaultManagers;