[ws-wss4j] branch master updated: Picking up some changes from Santuario

[coheigea]

This is an automated email from the ASF dual-hosted git repository.

coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ws-wss4j.git


The following commit(s) were added to refs/heads/master by this push:
     new fda1514  Picking up some changes from Santuario
fda1514 is described below

commit fda151491c9ced186d93ec8c0e4f4dd5df53e0f9
Author: Colm O hEigeartaigh <cohei...@apache.org>
AuthorDate: Tue Jan 28 13:40:43 2020 +0000

    Picking up some changes from Santuario
---
 .../main/java/org/apache/wss4j/dom/message/Encryptor.java   | 13 ++++++-------
 .../java/org/apache/wss4j/dom/util/EncryptionUtils.java     |  5 +++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git 
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/Encryptor.java 
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/Encryptor.java
index 3e61c40..53ff45d 100644
--- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/Encryptor.java
+++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/Encryptor.java
@@ -48,7 +48,6 @@ import org.apache.wss4j.dom.callback.CallbackLookup;
 import org.apache.wss4j.dom.callback.DOMCallbackLookup;
 import org.apache.wss4j.dom.util.WSSecurityUtil;
 import org.apache.xml.security.algorithms.JCEMapper;
-import org.apache.xml.security.c14n.Canonicalizer;
 import org.apache.xml.security.encryption.AbstractSerializer;
 import org.apache.xml.security.encryption.EncryptedData;
 import org.apache.xml.security.encryption.Serializer;
@@ -91,15 +90,16 @@ public class Encryptor {
 
         XMLCipher xmlCipher = null;
         try {
-            xmlCipher = XMLCipher.getInstance(encryptionAlgorithm);
+            if (encryptionSerializer != null) {
+                xmlCipher = XMLCipher.getInstance(encryptionAlgorithm, 
encryptionSerializer);
+            } else {
+                xmlCipher = XMLCipher.getInstance(encryptionAlgorithm);
+            }
         } catch (XMLEncryptionException ex) {
             throw new WSSecurityException(
                 WSSecurityException.ErrorCode.UNSUPPORTED_ALGORITHM, ex
             );
         }
-        if (encryptionSerializer != null) {
-            xmlCipher.setSerializer(encryptionSerializer);
-        }
 
         List<String> encDataRef = new ArrayList<>();
         WSEncryptionPart attachmentEncryptionPart = null;
@@ -278,8 +278,7 @@ public class Encryptor {
         Cipher cipher = createCipher(encryptionAlgorithm, secretKey);
 
         // Serialize and encrypt the element
-        AbstractSerializer serializer = new TransformSerializer();
-        
serializer.setCanonicalizer(Canonicalizer.getInstance(Canonicalizer.ALGO_ID_C14N_PHYSICAL));
+        AbstractSerializer serializer = new TransformSerializer(true);
 
         byte[] serializedOctets = null;
         if (type.equals(EncryptionConstants.TYPE_CONTENT)) {
diff --git 
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/EncryptionUtils.java 
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/EncryptionUtils.java
index e282f45..b0a0063 100644
--- 
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/EncryptionUtils.java
+++ 
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/EncryptionUtils.java
@@ -179,9 +179,10 @@ public final class EncryptionUtils {
 
         XMLCipher xmlCipher = null;
         try {
-            xmlCipher = XMLCipher.getInstance(symEncAlgo);
             if (encryptionSerializer != null) {
-                xmlCipher.setSerializer(encryptionSerializer);
+                xmlCipher = XMLCipher.getInstance(symEncAlgo, 
encryptionSerializer);
+            } else {
+                xmlCipher = XMLCipher.getInstance(symEncAlgo);
             }
             xmlCipher.setSecureValidation(true);
             xmlCipher.init(XMLCipher.DECRYPT_MODE, symmetricKey);