Repository: cxf Updated Branches: refs/heads/master 1487fccd4 -> ef34a5c50
NPE fix Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ef34a5c5 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ef34a5c5 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ef34a5c5 Branch: refs/heads/master Commit: ef34a5c50245cb51996689f0aa1c1dfab3a595de Parents: 1487fcc Author: Colm O hEigeartaigh <[email protected]> Authored: Mon Jul 13 11:55:49 2015 +0100 Committer: Colm O hEigeartaigh <[email protected]> Committed: Mon Jul 13 11:55:49 2015 +0100 ---------------------------------------------------------------------- .../wss4j/AlgorithmSuiteTranslater.java | 54 ++++++++++---------- 1 file changed, 28 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/ef34a5c5/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 63dfd56..c360f79 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 @@ -95,37 +95,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());
