Author: alessio.soldano(a)jboss.com Date: 2013-07-15 19:31:28 -0400 (Mon, 15 Jul 2013) New Revision: 17782 Added: stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/AsymmetricBinding_X509v1_GCM256OAEP_ProtectTokens-BINDING.xml Removed: stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/AsymmetricBinding_X509v1_GCM192OAEP_ProtectTokens-BINDING.xml Modified: stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/org.jboss.wsf.stack.cxf.extensions.policy.PolicyAttachmentStore stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/AnnotatedServiceImpl.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/AnnotatedSignEncryptTestCase.java Log: [JBWS-3648] Use GCM 256 algorithm, as the 192bit version is disallowed by BSP Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/AsymmetricBinding_X509v1_GCM192OAEP_ProtectTokens-BINDING.xml =================================================================== --- stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/AsymmetricBinding_X509v1_GCM192OAEP_ProtectTokens-BINDING.xml 2013-07-15 23:28:02 UTC (rev 17781) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/AsymmetricBinding_X509v1_GCM192OAEP_ProtectTokens-BINDING.xml 2013-07-15 23:31:28 UTC (rev 17782) @@ -1,56 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsp:Policy wsu:Id="AsymmetricBinding_X509v1_GCM192OAEP_ProtectTokens_binding_policy" - xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-w... - xmlns:wsp="http://www.w3.org/ns/ws-policy" - xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702&... - <wsp:ExactlyOne> - <wsp:All> - <sp:AsymmetricBinding> - <wsp:Policy> - <sp:InitiatorToken> - <wsp:Policy> - <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/... - <wsp:Policy> - <sp:WssX509V1Token11/> - </wsp:Policy> - </sp:X509Token> - </wsp:Policy> - </sp:InitiatorToken> - <sp:RecipientToken> - <wsp:Policy> - <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/... - <wsp:Policy> - <sp:WssX509V1Token11/> - </wsp:Policy> - </sp:X509Token> - </wsp:Policy> - </sp:RecipientToken> - <sp:Layout> - <wsp:Policy> - <sp:Lax/> - </wsp:Policy> - </sp:Layout> - <sp:IncludeTimestamp/> - <sp:ProtectTokens/> - <sp:OnlySignEntireHeadersAndBody/> - <sp:AlgorithmSuite> - <wsp:Policy> - <sp-cxf:Basic192GCM xmlns:sp-cxf="http://cxf.apache.org/custom/security-policy"/> - </wsp:Policy> - </sp:AlgorithmSuite> - </wsp:Policy> - </sp:AsymmetricBinding> - <sp:SignedParts> - <sp:Body/> - </sp:SignedParts> - <sp:EncryptedParts> - <sp:Body/> - </sp:EncryptedParts> - <sp:Wss10> - <wsp:Policy> - <sp:MustSupportRefIssuerSerial/> - </wsp:Policy> - </sp:Wss10> - </wsp:All> - </wsp:ExactlyOne> -</wsp:Policy> \ No newline at end of file Added: stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/AsymmetricBinding_X509v1_GCM256OAEP_ProtectTokens-BINDING.xml =================================================================== --- stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/AsymmetricBinding_X509v1_GCM256OAEP_ProtectTokens-BINDING.xml (rev 0) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/AsymmetricBinding_X509v1_GCM256OAEP_ProtectTokens-BINDING.xml 2013-07-15 23:31:28 UTC (rev 17782) @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="UTF-8"?> +<wsp:Policy wsu:Id="AsymmetricBinding_X509v1_GCM256OAEP_ProtectTokens_binding_policy" + xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-w... + xmlns:wsp="http://www.w3.org/ns/ws-policy" + xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702&... + <wsp:ExactlyOne> + <wsp:All> + <sp:AsymmetricBinding> + <wsp:Policy> + <sp:InitiatorToken> + <wsp:Policy> + <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/... + <wsp:Policy> + <sp:WssX509V1Token11/> + </wsp:Policy> + </sp:X509Token> + </wsp:Policy> + </sp:InitiatorToken> + <sp:RecipientToken> + <wsp:Policy> + <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/... + <wsp:Policy> + <sp:WssX509V1Token11/> + </wsp:Policy> + </sp:X509Token> + </wsp:Policy> + </sp:RecipientToken> + <sp:Layout> + <wsp:Policy> + <sp:Lax/> + </wsp:Policy> + </sp:Layout> + <sp:IncludeTimestamp/> + <sp:ProtectTokens/> + <sp:OnlySignEntireHeadersAndBody/> + <sp:AlgorithmSuite> + <wsp:Policy> + <sp-cxf:Basic256GCM xmlns:sp-cxf="http://cxf.apache.org/custom/security-policy"/> + </wsp:Policy> + </sp:AlgorithmSuite> + </wsp:Policy> + </sp:AsymmetricBinding> + <sp:SignedParts> + <sp:Body/> + </sp:SignedParts> + <sp:EncryptedParts> + <sp:Body/> + </sp:EncryptedParts> + <sp:Wss10> + <wsp:Policy> + <sp:MustSupportRefIssuerSerial/> + </wsp:Policy> + </sp:Wss10> + </wsp:All> + </wsp:ExactlyOne> +</wsp:Policy> \ No newline at end of file Modified: stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/org.jboss.wsf.stack.cxf.extensions.policy.PolicyAttachmentStore =================================================================== --- stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/org.jboss.wsf.stack.cxf.extensions.policy.PolicyAttachmentStore 2013-07-15 23:28:02 UTC (rev 17781) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/org.jboss.wsf.stack.cxf.extensions.policy.PolicyAttachmentStore 2013-07-15 23:31:28 UTC (rev 17782) @@ -1,5 +1,5 @@ AsymmetricBinding_X509v1_TripleDesRsa15_EncryptBeforeSigning_ProtectTokens -AsymmetricBinding_X509v1_GCM192OAEP_ProtectTokens +AsymmetricBinding_X509v1_GCM256OAEP_ProtectTokens WS-SP-EX221_WSS10_Mutual_Auth_X509_Sign_Encrypt WS-SP-EX222_WSS10_Mutual_Auth_X509_Sign_Encrypt WS-SP-EX223_WSS11_Anonymous_X509_Sign_Encrypt Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/AnnotatedServiceImpl.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/AnnotatedServiceImpl.java 2013-07-15 23:28:02 UTC (rev 17781) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/AnnotatedServiceImpl.java 2013-07-15 23:31:28 UTC (rev 17782) @@ -42,7 +42,7 @@ @EndpointProperty(key = "ws-security.callback-handler", value = "org.jboss.test.ws.jaxws.samples.wsse.policy.basic.KeystorePasswordCallback") } ) -@PolicySets("AsymmetricBinding_X509v1_GCM192OAEP_ProtectTokens") +@PolicySets("AsymmetricBinding_X509v1_GCM256OAEP_ProtectTokens") public class AnnotatedServiceImpl implements AnnotatedServiceIface { public String sayHello() Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/AnnotatedSignEncryptTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/AnnotatedSignEncryptTestCase.java 2013-07-15 23:28:02 UTC (rev 17781) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/AnnotatedSignEncryptTestCase.java 2013-07-15 23:31:28 UTC (rev 17782) @@ -64,7 +64,7 @@ br.close(); } String wsdl = sb.toString(); - assertTrue(wsdl.contains("AsymmetricBinding_X509v1_GCM192OAEP_ProtectTokens_binding_policy")); + assertTrue(wsdl.contains("AsymmetricBinding_X509v1_GCM256OAEP_ProtectTokens_binding_policy")); } public void test() throws Exception