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 2017/01/31 13:37:58 UTC
svn commit: r1781082 - in /webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/message: Encryptor.java WSSecDKEncrypt.java WSSecEncrypt.java

Author: coheigea
Date: Tue Jan 31 13:37:58 2017
New Revision: 1781082

URL: http://svn.apache.org/viewvc?rev=1781082&view=rev
Log:
Fixing merge

Modified:
    webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/Encryptor.java
    webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecDKEncrypt.java
    webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecEncrypt.java

Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/Encryptor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/Encryptor.java?rev=1781082&r1=1781081&r2=1781082&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/Encryptor.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/Encryptor.java Tue Jan 31 13:37:58 2017
@@ -421,7 +421,7 @@ public class Encryptor {
         elem.appendChild(elementToEncrypt);
 
         if (securityHeader != null) {
-            NamedNodeMap map = securityHeader.getSecurityHeaderElement().getAttributes();
+            NamedNodeMap map = securityHeader.getSecurityHeader().getAttributes();
             for (int i = 0; i < map.getLength(); i++) {
                 Attr attr = (Attr)map.item(i);
                 if (WSConstants.URI_SOAP11_ENV.equals(attr.getNamespaceURI())

Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecDKEncrypt.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecDKEncrypt.java?rev=1781082&r1=1781081&r2=1781082&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecDKEncrypt.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecDKEncrypt.java Tue Jan 31 13:37:58 2017
@@ -139,8 +139,8 @@ public class WSSecDKEncrypt extends WSSe
         SecretKey key = getDerivedKey(symEncAlgo);
 
         Encryptor encryptor = new Encryptor();
-        encryptor.setDoc(getDocument());
-        encryptor.setSecurityHeader(getSecurityHeader());
+        encryptor.setDoc(document);
+        encryptor.setSecurityHeader(secHeader);
         encryptor.setIdAllocator(getIdAllocator());
         encryptor.setCallbackLookup(callbackLookup);
         encryptor.setAttachmentCallbackHandler(attachmentCallbackHandler);

Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecEncrypt.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecEncrypt.java?rev=1781082&r1=1781081&r2=1781082&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecEncrypt.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecEncrypt.java Tue Jan 31 13:37:58 2017
@@ -43,6 +43,7 @@ import org.apache.wss4j.dom.message.toke
 import org.apache.wss4j.dom.util.WSSecurityUtil;
 import org.apache.xml.security.encryption.Serializer;
 import org.apache.xml.security.keys.KeyInfo;
+import org.apache.xml.security.utils.Base64;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -249,8 +250,8 @@ public class WSSecEncrypt extends WSSecE
         SecretKeySpec secretKeySpec = new SecretKeySpec(symmetricKey.getEncoded(), symmetricKey.getAlgorithm());
         
         Encryptor encryptor = new Encryptor();
-        encryptor.setDoc(getDocument());
-        encryptor.setSecurityHeader(getSecurityHeader());
+        encryptor.setDoc(document);
+        encryptor.setSecurityHeader(secHeader);
         encryptor.setIdAllocator(getIdAllocator());
         encryptor.setCallbackLookup(callbackLookup);
         encryptor.setAttachmentCallbackHandler(attachmentCallbackHandler);