Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 54262 invoked from network); 15 Oct 2010 13:27:43 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 15 Oct 2010 13:27:43 -0000 Received: (qmail 18641 invoked by uid 500); 15 Oct 2010 13:27:43 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 18516 invoked by uid 500); 15 Oct 2010 13:27:41 -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 18509 invoked by uid 99); 15 Oct 2010 13:27:40 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Oct 2010 13:27:40 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED 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; Fri, 15 Oct 2010 13:27:39 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 173F323889B2; Fri, 15 Oct 2010 13:26:44 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1022911 - in /cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers: AbstractBindingBuilder.java AsymmetricBindingHandler.java Date: Fri, 15 Oct 2010 13:26:44 -0000 To: commits@cxf.apache.org From: dvaleri@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101015132644.173F323889B2@eris.apache.org> Author: dvaleri Date: Fri Oct 15 13:26:43 2010 New Revision: 1022911 URL: http://svn.apache.org/viewvc?rev=1022911&view=rev Log: [CXF-3067] Removed duplicate code. Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java?rev=1022911&r1=1022910&r2=1022911&view=diff ============================================================================== --- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java (original) +++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java Fri Oct 15 13:26:43 2010 @@ -1356,6 +1356,7 @@ public abstract class AbstractBindingBui } sig.setUserInfo(user, password); sig.setSignatureAlgorithm(binding.getAlgorithmSuite().getAsymmetricSignature()); + sig.setDigestAlgo(binding.getAlgorithmSuite().getDigest()); sig.setSigCanonicalization(binding.getAlgorithmSuite().getInclusiveC14n()); try { 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=1022911&r1=1022910&r2=1022911&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 Fri Oct 15 13:26:43 2010 @@ -400,11 +400,6 @@ public class AsymmetricBindingHandler ex insertBeforeBottomUp(sig.getSignatureElement()); sigParts.addAll(this.getSignedParts()); - AlgorithmSuite algorithmSuite = abinding.getAlgorithmSuite(); - sig.setSignatureAlgorithm(algorithmSuite.getAsymmetricSignature()); - sig.setDigestAlgo(algorithmSuite.getDigest()); - sig.setSigCanonicalization(algorithmSuite.getInclusiveC14n()); - sig.addReferencesToSign(sigParts, secHeader); sig.computeSignature(); signatures.add(sig.getSignatureValue());