Repository: cxf Updated Branches: refs/heads/master e4119c6fe -> 5fbe7b49b
Fixing bug with setting the signature digest algorithm for the SymmetricBinding Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/d86fd8e7 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d86fd8e7 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d86fd8e7 Branch: refs/heads/master Commit: d86fd8e725958b55269c2c3803520293f17a400e Parents: e4119c6 Author: Colm O hEigeartaigh <cohei...@apache.org> Authored: Mon Sep 7 12:08:19 2015 +0100 Committer: Colm O hEigeartaigh <cohei...@apache.org> Committed: Mon Sep 7 12:08:19 2015 +0100 ---------------------------------------------------------------------- .../ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java | 2 ++ .../ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java | 2 ++ 2 files changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/d86fd8e7/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java index e47fea6..e3e011e 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java @@ -2037,6 +2037,8 @@ public abstract class AbstractBindingBuilder extends AbstractCommonBindingHandle sig.setCustomTokenId(sigTokId); sig.setSecretKey(tok.getSecret()); sig.setSignatureAlgorithm(binding.getAlgorithmSuite().getSymmetricSignature()); + AlgorithmSuiteType algType = binding.getAlgorithmSuite().getAlgorithmSuiteType(); + sig.setDigestAlgo(algType.getDigest()); sig.setSigCanonicalization(binding.getAlgorithmSuite().getC14n().getValue()); sig.prepare(doc, getSignatureCrypto(), secHeader); http://git-wip-us.apache.org/repos/asf/cxf/blob/d86fd8e7/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 dcd494e..ddbcc69 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 @@ -857,6 +857,8 @@ public class SymmetricBindingHandler extends AbstractBindingBuilder { sig.setCustomTokenId(sigTokId); sig.setSecretKey(tok.getSecret()); sig.setSignatureAlgorithm(sbinding.getAlgorithmSuite().getSymmetricSignature()); + AlgorithmSuiteType algType = sbinding.getAlgorithmSuite().getAlgorithmSuiteType(); + sig.setDigestAlgo(algType.getDigest()); sig.setSigCanonicalization(sbinding.getAlgorithmSuite().getC14n().getValue()); Crypto crypto = null; if (sbinding.getProtectionToken() != null) {
