You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2014/04/24 16:10:14 UTC

svn commit: r1589734 - /webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/processor/ReferenceListProcessor.java

Author: coheigea
Date: Thu Apr 24 14:10:13 2014
New Revision: 1589734

URL: http://svn.apache.org/r1589734
Log:
[CXF-497] - Remove the EncryptedAssertion wrapper after decrypting

Modified:
    webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/processor/ReferenceListProcessor.java

Modified: webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/processor/ReferenceListProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/processor/ReferenceListProcessor.java?rev=1589734&r1=1589733&r2=1589734&view=diff
==============================================================================
--- webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/processor/ReferenceListProcessor.java (original)
+++ webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/processor/ReferenceListProcessor.java Thu Apr 24 14:10:13 2014
@@ -340,7 +340,9 @@ public class ReferenceListProcessor impl
         }
         
         if (parent.getLocalName().equals(WSConstants.ENCRYPTED_HEADER)
-            && parent.getNamespaceURI().equals(WSConstants.WSSE11_NS)) {
+            && parent.getNamespaceURI().equals(WSConstants.WSSE11_NS)
+            || parent.getLocalName().equals(WSConstants.ENCRYPED_ASSERTION_LN)
+            && parent.getNamespaceURI().equals(WSConstants.SAML2_NS)) {
                 
             Node decryptedHeader = parent.getFirstChild();
             Node soapHeader = parent.getParentNode();