Repository: cxf Updated Branches: refs/heads/3.0.x-fixes 90732f307 -> 5800f47a1
[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/5800f47a Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/5800f47a Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/5800f47a Branch: refs/heads/3.0.x-fixes Commit: 5800f47a185ef0acf8e4be9d150d60bf5fb88420 Parents: 90732f3 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:24:57 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/5800f47a/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 d5b18f1..7e55e12 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 @@ -635,6 +635,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/5800f47a/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 dfc0900..e520d2a 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 @@ -687,6 +687,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
