Repository: cxf Updated Branches: refs/heads/master 4b489fff9 -> 00b626af5
[CXF-6398] - AlgorithmSuitePolicyValidator rejects enveloped-signature Transform Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/00b626af Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/00b626af Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/00b626af Branch: refs/heads/master Commit: 00b626af504d3d59419ec2d1eb5e39943ec5b8aa Parents: 44bf65e Author: Colm O hEigeartaigh <[email protected]> Authored: Tue May 12 12:38:34 2015 +0100 Committer: Colm O hEigeartaigh <[email protected]> Committed: Tue May 12 14:17:32 2015 +0100 ---------------------------------------------------------------------- .../wss4j/policyvalidators/AlgorithmSuitePolicyValidator.java | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/00b626af/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AlgorithmSuitePolicyValidator.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AlgorithmSuitePolicyValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AlgorithmSuitePolicyValidator.java index d09f974..e65ef51 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AlgorithmSuitePolicyValidator.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AlgorithmSuitePolicyValidator.java @@ -41,6 +41,7 @@ import org.apache.wss4j.policy.SP11Constants; import org.apache.wss4j.policy.SP12Constants; import org.apache.wss4j.policy.model.AlgorithmSuite; import org.apache.wss4j.policy.model.AlgorithmSuite.AlgorithmSuiteType; +import org.apache.xml.security.transforms.Transforms; /** * Validate results corresponding to the processing of a Signature, EncryptedKey or @@ -168,6 +169,7 @@ public class AlgorithmSuitePolicyValidator extends AbstractSecurityPolicyValidat if (!(algorithmPolicy.getC14n().getValue().equals(transformAlgorithm) || WSConstants.C14N_EXCL_OMIT_COMMENTS.equals(transformAlgorithm) || STRTransform.TRANSFORM_URI.equals(transformAlgorithm) + || Transforms.TRANSFORM_ENVELOPED_SIGNATURE.equals(transformAlgorithm) || WSConstants.SWA_ATTACHMENT_CONTENT_SIG_TRANS.equals(transformAlgorithm) || WSConstants.SWA_ATTACHMENT_COMPLETE_SIG_TRANS.equals(transformAlgorithm))) { ai.setNotAsserted("The transform algorithms do not match the requirement");
