cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject cxf git commit: CXF-6951 - Support using the initiator token's public key for response encryption by recipient
Date Fri, 24 Jun 2016 12:30:44 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes ddcd83912 -> 12b8e711d


CXF-6951 - Support using the initiator token's public key for response encryption by recipient


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

Branch: refs/heads/3.1.x-fixes
Commit: 12b8e711d2068044caa9ceb57e3fe038e4e92cfc
Parents: ddcd839
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Fri Jun 24 13:30:34 2016 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Fri Jun 24 13:30:34 2016 +0100

----------------------------------------------------------------------
 .../wss4j/policyhandlers/AsymmetricBindingHandler.java        | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/12b8e711/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 c31d33d..791a36e 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
@@ -19,6 +19,7 @@
 
 package org.apache.cxf.ws.security.wss4j.policyhandlers;
 
+import java.security.PublicKey;
 import java.security.cert.X509Certificate;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -481,13 +482,13 @@ public class AsymmetricBindingHandler extends AbstractBindingBuilder
{
                     if (!isRequestor() && securityToken != null 
                         && securityToken.getX509Certificate() != null) {
                         encr.setUseThisCert(securityToken.getX509Certificate());
-                    } else { /* TODO when WSS4J 2.1.5 is released else if (!isRequestor()
&& securityToken != null 
+                    } else if (!isRequestor() && securityToken != null 
                         && securityToken.getKey() instanceof PublicKey) {
                         encr.setUseThisPublicKey((PublicKey)securityToken.getKey());
-                    } */
+                    } else {
                         setEncryptionUser(encr, encrToken, false, crypto);
                     }
-                    if (!encr.isCertSet() // TODO when WSS4J 2.1.5 is released&&
encr.getUseThisPublicKey() == null
+                    if (!encr.isCertSet() && encr.getUseThisPublicKey() == null
                         && crypto == null) {
                         unassertPolicy(recToken, "Missing security configuration. "
                                 + "Make sure jaxws:client element is configured " 


Mime
View raw message