[2/3] cxf git commit: [CXF-6473] - Double signatures while using AsymmetricBindingHandle

[coheigea]

[CXF-6473] - Double signatures while using AsymmetricBindingHandle

Conflicts:
        
rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ed86c112
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ed86c112
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ed86c112

Branch: refs/heads/2.7.x-fixes
Commit: ed86c112661de1347faa8985fe6f2ab6fc5f0ffd
Parents: f27f790
Author: Colm O hEigeartaigh <cohei...@apache.org>
Authored: Wed Jun 24 16:53:12 2015 +0100
Committer: Colm O hEigeartaigh <cohei...@apache.org>
Committed: Wed Jun 24 16:59:23 2015 +0100

----------------------------------------------------------------------
 .../wss4j/policyhandlers/AsymmetricBindingHandler.java       | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/ed86c112/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
----------------------------------------------------------------------
diff --git 
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
 
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
index 87fe395..9f582c0 100644
--- 
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
+++ 
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
@@ -143,6 +143,8 @@ public class AsymmetricBindingHandler extends 
AbstractBindingBuilder {
             }
             addSupportingTokens(sigs);
             
+            sigs.addAll(this.getSignedParts(null));
+            
             if (isRequestor() && initiatorWrapper != null) {
                 doSignature(initiatorWrapper, sigs, attached);
                 doEndorse();
@@ -257,7 +259,7 @@ public class AsymmetricBindingHandler extends 
AbstractBindingBuilder {
         List<WSEncryptionPart> sigParts = null;
         try {
             encrParts = getEncryptedParts();
-            //Signed parts are determined before encryption because encrypted 
signed  headers
+            //Signed parts are determined before encryption because encrypted 
signed headers
             //will not be included otherwise
             sigParts = getSignedParts();
         } catch (SOAPException ex) {
@@ -502,8 +504,12 @@ public class AsymmetricBindingHandler extends 
AbstractBindingBuilder {
             assertUnusedTokens(abinding.getRecipientSignatureToken());
         }
         
+<<<<<<< HEAD
         Token sigToken = wrapper.getToken();
         sigParts.addAll(this.getSignedParts());
+=======
+        AbstractToken sigToken = wrapper.getToken();
+>>>>>>> 273351c... [CXF-6473] - Double signatures while using 
AsymmetricBindingHandle
         if (sigParts.isEmpty()) {
             // Add the BST to the security header if required
             if (!attached && includeToken(sigToken.getInclusion())) {