cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r881941 - in /cxf/branches/2.2.x-fixes: ./ rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java systests/ws-specs/src/test/resources/wsdl_systest_wsspec/wssec10/WsSecurity10_policy.wsdl
Date Wed, 18 Nov 2009 21:21:51 GMT
Author: dkulp
Date: Wed Nov 18 21:21:50 2009
New Revision: 881941

URL: http://svn.apache.org/viewvc?rev=881941&view=rev
Log:
Merged revisions 881940 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r881940 | dkulp | 2009-11-18 16:18:24 -0500 (Wed, 18 Nov 2009) | 1 line
  
  [CXF-2547] Fix issues with sig confirmation and Asym binding
........

Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
    cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/resources/wsdl_systest_wsspec/wssec10/WsSecurity10_policy.wsdl

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
    svn:mergeinfo = /cxf/trunk:881940

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java?rev=881941&r1=881940&r2=881941&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
(original)
+++ cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
Wed Nov 18 21:21:50 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/branches/2.2.x-fixes/systests/ws-specs/src/test/resources/wsdl_systest_wsspec/wssec10/WsSecurity10_policy.wsdl
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/resources/wsdl_systest_wsspec/wssec10/WsSecurity10_policy.wsdl?rev=881941&r1=881940&r2=881941&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/resources/wsdl_systest_wsspec/wssec10/WsSecurity10_policy.wsdl
(original)
+++ cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/resources/wsdl_systest_wsspec/wssec10/WsSecurity10_policy.wsdl
Wed Nov 18 21:21:50 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>



Mime
View raw message