commit d2107e618900dce4dda39bfd95fa1a7926bcb16b
author Colm O hEigeartaigh <coheigea@apache.org> Fri Nov 27 09:00:06 2020 +0000
committer Colm O hEigeartaigh <coheigea@apache.org> Fri Nov 27 09:00:06 2020 +0000
tree 5c197b7b98a663c0acea0b3918b326aaaf1b8c51
parent 7423d4d3e5465f9302e3013d8ba667d2b8093f45

Picking up some Santuario changes

ws-security-dom/src/main/java/org/apache/wss4j/dom/message/Encryptor.java

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 eb41356..8d409a3 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
@@ -91,7 +91,7 @@
         XMLCipher xmlCipher = null;
         try {
             if (encryptionSerializer != null) {
-                xmlCipher = XMLCipher.getInstance(encryptionAlgorithm, encryptionSerializer);
+                xmlCipher = XMLCipher.getInstance(encryptionSerializer, encryptionAlgorithm);
             } else {
                 xmlCipher = XMLCipher.getInstance(encryptionAlgorithm);
             }

ws-security-dom/src/main/java/org/apache/wss4j/dom/util/EncryptionUtils.java

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 98615c2..22802ec 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
@@ -181,7 +181,7 @@
         XMLCipher xmlCipher = null;
         try {
             if (encryptionSerializer != null) {
-                xmlCipher = XMLCipher.getInstance(symEncAlgo, encryptionSerializer);
+                xmlCipher = XMLCipher.getInstance(encryptionSerializer, symEncAlgo);
             } else {
                 xmlCipher = XMLCipher.getInstance(symEncAlgo);
             }