ws-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [ws-wss4j] branch master updated: Picking up some Santuario changes
Date Fri, 27 Nov 2020 09:00:25 GMT
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 d2107e6  Picking up some Santuario changes
d2107e6 is described below

commit d2107e618900dce4dda39bfd95fa1a7926bcb16b
Author: Colm O hEigeartaigh <coheigea@apache.org>
AuthorDate: Fri Nov 27 09:00:06 2020 +0000

    Picking up some Santuario changes
---
 .../src/main/java/org/apache/wss4j/dom/message/Encryptor.java           | 2 +-
 .../src/main/java/org/apache/wss4j/dom/util/EncryptionUtils.java        | 2 +-
 2 files changed, 2 insertions(+), 2 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 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 @@ public class Encryptor {
         XMLCipher xmlCipher = null;
         try {
             if (encryptionSerializer != null) {
-                xmlCipher = XMLCipher.getInstance(encryptionAlgorithm, encryptionSerializer);
+                xmlCipher = XMLCipher.getInstance(encryptionSerializer, encryptionAlgorithm);
             } else {
                 xmlCipher = XMLCipher.getInstance(encryptionAlgorithm);
             }
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 @@ public final class EncryptionUtils {
         XMLCipher xmlCipher = null;
         try {
             if (encryptionSerializer != null) {
-                xmlCipher = XMLCipher.getInstance(symEncAlgo, encryptionSerializer);
+                xmlCipher = XMLCipher.getInstance(encryptionSerializer, symEncAlgo);
             } else {
                 xmlCipher = XMLCipher.getInstance(symEncAlgo);
             }


Mime
View raw message