cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dval...@apache.org
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 GMT
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());



Mime
View raw message