Author: dkulp
Date: Wed Nov 18 21:18:24 2009
New Revision: 881940
URL: http://svn.apache.org/viewvc?rev=881940&view=rev
Log:
[CXF-2547] Fix issues with sig confirmation and Asym binding
Modified:
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
cxf/trunk/systests/ws-specs/src/test/resources/wsdl_systest_wsspec/wssec10/WsSecurity10_policy.wsdl
Modified:
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java?rev=881940&r1=881939&r2=881940&view=diff
==============================================================================
---
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
(original)
+++
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
Wed Nov 18 21:18:24 2009
@@ -373,6 +373,7 @@
// Do signature
dkSign.computeSignature();
+ signatures.add(dkSign.getSignatureValue());
// Add elements to header
addDerivedKeyElement(dkSign.getdktElement());
@@ -393,6 +394,7 @@
sig.addReferencesToSign(sigParts, secHeader);
sig.computeSignature();
+ signatures.add(sig.getSignatureValue());
insertBeforeBottomUp(sig.getSignatureElement());
mainSigId = addWsuIdToElement(sig.getSignatureElement());
Modified:
cxf/trunk/systests/ws-specs/src/test/resources/wsdl_systest_wsspec/wssec10/WsSecurity10_policy.wsdl
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/ws-specs/src/test/resources/wsdl_systest_wsspec/wssec10/WsSecurity10_policy.wsdl?rev=881940&r1=881939&r2=881940&view=diff
==============================================================================
---
cxf/trunk/systests/ws-specs/src/test/resources/wsdl_systest_wsspec/wssec10/WsSecurity10_policy.wsdl
(original)
+++
cxf/trunk/systests/ws-specs/src/test/resources/wsdl_systest_wsspec/wssec10/WsSecurity10_policy.wsdl
Wed Nov 18 21:18:24 2009
@@ -113,12 +113,13 @@
<sp:OnlySignEntireHeadersAndBody/>
</wsp:Policy>
</sp:AsymmetricBinding>
- <sp:Wss10
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
+ <sp:Wss11
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
<wsp:Policy>
<sp:MustSupportRefKeyIdentifier/>
<sp:MustSupportRefIssuerSerial/>
+
<sp:RequireSignatureConfirmation/>
</wsp:Policy>
- </sp:Wss10>
+ </sp:Wss11>
</wsp:All>
</wsp:ExactlyOne>
</wsp:Policy>
