Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 56588 invoked from network); 18 Nov 2009 21:18:47 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 18 Nov 2009 21:18:47 -0000 Received: (qmail 76410 invoked by uid 500); 18 Nov 2009 21:18:47 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 76318 invoked by uid 500); 18 Nov 2009 21:18:47 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 76309 invoked by uid 99); 18 Nov 2009 21:18:47 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 Nov 2009 21:18:47 +0000 X-ASF-Spam-Status: No, hits=-2.7 required=5.0 tests=AWL,BAYES_00 X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 Nov 2009 21:18:44 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id BE29D2388904; Wed, 18 Nov 2009 21:18:24 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r881940 - in /cxf/trunk: 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:18:24 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091118211824.BE29D2388904@eris.apache.org> 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 @@ - + + - +