You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dv...@apache.org on 2010/10/15 17:06:07 UTC
svn commit: r1022961 - in /cxf/branches/2.2.x-fixes: ./
rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/
Author: dvaleri
Date: Fri Oct 15 15:06:06 2010
New Revision: 1022961
URL: http://svn.apache.org/viewvc?rev=1022961&view=rev
Log:
Merged revisions 1022935 via svnmerge from
https://svn.apache.org/repos/asf/cxf/branches/2.3.x-fixes
................
r1022935 | dvaleri | 2010-10-15 10:25:55 -0400 (Fri, 15 Oct 2010) | 9 lines
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.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 15 15:06:06 2010
@@ -1 +1,2 @@
-/cxf/trunk:1021916
+/cxf/branches/2.3.x-fixes:1022935
+/cxf/trunk:1021916,1022911
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/AbstractBindingBuilder.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/AbstractBindingBuilder.java?rev=1022961&r1=1022960&r2=1022961&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java (original)
+++ cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java Fri Oct 15 15:06:06 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.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=1022961&r1=1022960&r2=1022961&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 Fri Oct 15 15:06:06 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());