cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dval...@apache.org
Subject svn commit: r1022935 - in /cxf/branches/2.3.x-fixes: ./ rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/
Date Fri, 15 Oct 2010 14:25:55 GMT
Author: dvaleri
Date: Fri Oct 15 14:25:55 2010
New Revision: 1022935

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

........
  r1022911 | dvaleri | 2010-10-15 09:26:43 -0400 (Fri, 15 Oct 2010) | 1 line
  
  [CXF-3067] Removed duplicate code.
........

Modified:
    cxf/branches/2.3.x-fixes/   (props changed)
    cxf/branches/2.3.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
    cxf/branches/2.3.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 15 14:25:55 2010
@@ -1 +1 @@
-/cxf/trunk:1022401-1022402
+/cxf/trunk:1022401-1022402,1022911

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Oct 15 14:25:55 2010
@@ -1 +1 @@
-/cxf/trunk:1-1022129,1022154,1022194,1022401-1022402
+/cxf/trunk:1-1022129,1022154,1022194,1022401-1022402,1022911

Modified: cxf/branches/2.3.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java?rev=1022935&r1=1022934&r2=1022935&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
(original)
+++ cxf/branches/2.3.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
Fri Oct 15 14:25:55 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/branches/2.3.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.3.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java?rev=1022935&r1=1022934&r2=1022935&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
(original)
+++ cxf/branches/2.3.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
Fri Oct 15 14:25:55 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