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 CC67818FDF for ; Mon, 13 Jul 2015 11:13:27 +0000 (UTC) Received: (qmail 73979 invoked by uid 500); 13 Jul 2015 11:13:27 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 73916 invoked by uid 500); 13 Jul 2015 11:13:27 -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 73907 invoked by uid 99); 13 Jul 2015 11:13:27 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 13 Jul 2015 11:13:27 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 971ECDFFA9; Mon, 13 Jul 2015 11:13:27 +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 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: cxf git commit: NPE fix Date: Mon, 13 Jul 2015 11:13:27 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/3.0.x-fixes 71c65e8cc -> b6da59447 NPE fix Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/b6da5944 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b6da5944 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b6da5944 Branch: refs/heads/3.0.x-fixes Commit: b6da5944704b1075cc88d5b154786c059eefb447 Parents: 71c65e8 Author: Colm O hEigeartaigh Authored: Mon Jul 13 11:55:49 2015 +0100 Committer: Colm O hEigeartaigh Committed: Mon Jul 13 12:13:17 2015 +0100 ---------------------------------------------------------------------- .../wss4j/AlgorithmSuiteTranslater.java | 54 ++++++++++---------- 1 file changed, 28 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/b6da5944/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AlgorithmSuiteTranslater.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AlgorithmSuiteTranslater.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AlgorithmSuiteTranslater.java index 372dd89..083d2f6 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AlgorithmSuiteTranslater.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AlgorithmSuiteTranslater.java @@ -101,37 +101,39 @@ public final class AlgorithmSuiteTranslater { } AlgorithmSuiteType algorithmSuiteType = cxfAlgorithmSuite.getAlgorithmSuiteType(); + if (algorithmSuiteType != null) { // Set asymmetric key lengths - if (algorithmSuite.getMaximumAsymmetricKeyLength() - < algorithmSuiteType.getMaximumAsymmetricKeyLength()) { - algorithmSuite.setMaximumAsymmetricKeyLength( - algorithmSuiteType.getMaximumAsymmetricKeyLength()); - } - if (algorithmSuite.getMinimumAsymmetricKeyLength() - > algorithmSuiteType.getMinimumAsymmetricKeyLength()) { - algorithmSuite.setMinimumAsymmetricKeyLength( - algorithmSuiteType.getMinimumAsymmetricKeyLength()); - } - - // Set symmetric key lengths - if (algorithmSuite.getMaximumSymmetricKeyLength() - < algorithmSuiteType.getMaximumSymmetricKeyLength()) { - algorithmSuite.setMaximumSymmetricKeyLength( - algorithmSuiteType.getMaximumSymmetricKeyLength()); - } - if (algorithmSuite.getMinimumSymmetricKeyLength() - > algorithmSuiteType.getMinimumSymmetricKeyLength()) { - algorithmSuite.setMinimumSymmetricKeyLength( - algorithmSuiteType.getMinimumSymmetricKeyLength()); - } + if (algorithmSuite.getMaximumAsymmetricKeyLength() + < algorithmSuiteType.getMaximumAsymmetricKeyLength()) { + algorithmSuite.setMaximumAsymmetricKeyLength( + algorithmSuiteType.getMaximumAsymmetricKeyLength()); + } + if (algorithmSuite.getMinimumAsymmetricKeyLength() + > algorithmSuiteType.getMinimumAsymmetricKeyLength()) { + algorithmSuite.setMinimumAsymmetricKeyLength( + algorithmSuiteType.getMinimumAsymmetricKeyLength()); + } - algorithmSuite.addEncryptionMethod(algorithmSuiteType.getEncryption()); - algorithmSuite.addKeyWrapAlgorithm(algorithmSuiteType.getSymmetricKeyWrap()); - algorithmSuite.addKeyWrapAlgorithm(algorithmSuiteType.getAsymmetricKeyWrap()); + // Set symmetric key lengths + if (algorithmSuite.getMaximumSymmetricKeyLength() + < algorithmSuiteType.getMaximumSymmetricKeyLength()) { + algorithmSuite.setMaximumSymmetricKeyLength( + algorithmSuiteType.getMaximumSymmetricKeyLength()); + } + if (algorithmSuite.getMinimumSymmetricKeyLength() + > algorithmSuiteType.getMinimumSymmetricKeyLength()) { + algorithmSuite.setMinimumSymmetricKeyLength( + algorithmSuiteType.getMinimumSymmetricKeyLength()); + } + + algorithmSuite.addEncryptionMethod(algorithmSuiteType.getEncryption()); + algorithmSuite.addKeyWrapAlgorithm(algorithmSuiteType.getSymmetricKeyWrap()); + algorithmSuite.addKeyWrapAlgorithm(algorithmSuiteType.getAsymmetricKeyWrap()); + algorithmSuite.addDigestAlgorithm(algorithmSuiteType.getDigest()); + } algorithmSuite.addSignatureMethod(cxfAlgorithmSuite.getAsymmetricSignature()); algorithmSuite.addSignatureMethod(cxfAlgorithmSuite.getSymmetricSignature()); - algorithmSuite.addDigestAlgorithm(algorithmSuiteType.getDigest()); algorithmSuite.addC14nAlgorithm(cxfAlgorithmSuite.getC14n().getValue()); algorithmSuite.addTransformAlgorithm(cxfAlgorithmSuite.getC14n().getValue());