Repository: cxf Updated Branches: refs/heads/master a4e5a8ba3 -> bcb43c388
[CXF-6602] - Digest algorithms are not set properly when derived keys are used Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/bcb43c38 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/bcb43c38 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/bcb43c38 Branch: refs/heads/master Commit: bcb43c38898acdf9cf2fa5b1aaf87e95ea79b6e5 Parents: a4e5a8b Author: Colm O hEigeartaigh <[email protected]> Authored: Tue Sep 22 16:15:21 2015 +0200 Committer: Colm O hEigeartaigh <[email protected]> Committed: Tue Sep 22 16:15:21 2015 +0200 ---------------------------------------------------------------------- .../ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java | 1 + .../ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java | 1 + 2 files changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/bcb43c38/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java index 3a645a0..2f01258 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java @@ -642,6 +642,7 @@ public class AsymmetricBindingHandler extends AbstractBindingBuilder { dkSign.setSignatureAlgorithm(abinding.getAlgorithmSuite().getSymmetricSignature()); dkSign.setSigCanonicalization(abinding.getAlgorithmSuite().getC14n().getValue()); AlgorithmSuiteType algType = abinding.getAlgorithmSuite().getAlgorithmSuiteType(); + dkSign.setDigestAlgorithm(algType.getDigest()); dkSign.setDerivedKeyLength(algType.getSignatureDerivedKeyLength() / 8); dkSign.setCustomValueType(WSConstants.SOAPMESSAGE_NS11 + "#" + WSConstants.ENC_KEY_VALUE_TYPE); http://git-wip-us.apache.org/repos/asf/cxf/blob/bcb43c38/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java index b5a335f..73e1a38 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java @@ -697,6 +697,7 @@ public class SymmetricBindingHandler extends AbstractBindingBuilder { dkSign.setSignatureAlgorithm(sbinding.getAlgorithmSuite().getSymmetricSignature()); dkSign.setSigCanonicalization(sbinding.getAlgorithmSuite().getC14n().getValue()); AlgorithmSuiteType algType = sbinding.getAlgorithmSuite().getAlgorithmSuiteType(); + dkSign.setDigestAlgorithm(algType.getDigest()); dkSign.setDerivedKeyLength(algType.getSignatureDerivedKeyLength() / 8); if (tok.getSHA1() != null) { //Set the value type of the reference
