cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1061827 - in /cxf/branches/2.3.x-fixes/rt/ws/security: ./ src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java
Date Fri, 21 Jan 2011 14:44:15 GMT
Author: coheigea
Date: Fri Jan 21 14:44:14 2011
New Revision: 1061827

URL: http://svn.apache.org/viewvc?rev=1061827&view=rev
Log:
[CXF-3266] - CXF uses the incorrect namespace to refer to an Encrypted Key 

Modified:
    cxf/branches/2.3.x-fixes/rt/ws/security/   (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/SymmetricBindingHandler.java

Propchange: cxf/branches/2.3.x-fixes/rt/ws/security/
------------------------------------------------------------------------------
    svn:mergeinfo = /cxf/trunk/rt/ws/security:1061256-1061261,1061788

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=1061827&r1=1061826&r2=1061827&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 Jan 21 14:44:14 2011
@@ -1509,7 +1509,7 @@ public abstract class AbstractBindingBui
         // be used in the wsse:Reference in ds:KeyInfo
         if (policyToken instanceof X509Token) {
             if (isRequestor()) {
-                sig.setCustomTokenValueType(WSConstants.WSS_SAML_NS
+                sig.setCustomTokenValueType(WSConstants.SOAPMESSAGE_NS11 + "#"
                                       + WSConstants.ENC_KEY_VALUE_TYPE);
                 sig.setKeyIdentifierType(WSConstants.CUSTOM_SYMM_SIGNING);
             } else {

Modified: cxf/branches/2.3.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.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/SymmetricBindingHandler.java?rev=1061827&r1=1061826&r2=1061827&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java
(original)
+++ cxf/branches/2.3.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java
Fri Jan 21 14:44:14 2011
@@ -655,8 +655,8 @@ public class SymmetricBindingHandler ext
                 : WSConstants.CUSTOM_SYMM_SIGNING_DIRECT;
             if (policyToken instanceof X509Token) {
                 if (isRequestor()) {
-                    sig.setCustomTokenValueType(WSConstants.WSS_SAML_NS
-                                          + WSConstants.ENC_KEY_VALUE_TYPE);
+                    sig.setCustomTokenValueType(WSConstants.SOAPMESSAGE_NS11 + "#"
+                                                + WSConstants.ENC_KEY_VALUE_TYPE);
                     sig.setKeyIdentifierType(type);
                 } else {
                     //the tok has to be an EncryptedKey token



Mime
View raw message