ws-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [ws-wss4j] 03/03: Picking up latest Santuario changes
Date Fri, 14 Feb 2020 12:05:31 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

commit 22a27564acf7a5af35644dc63a85f95d3d8f8507
Author: Colm O hEigeartaigh <coheigea@apache.org>
AuthorDate: Fri Feb 14 12:05:06 2020 +0000

    Picking up latest Santuario changes
---
 .../src/main/java/org/apache/wss4j/common/util/AttachmentUtils.java     | 2 +-
 .../src/main/java/org/apache/wss4j/dom/message/Encryptor.java           | 2 +-
 .../apache/wss4j/stax/impl/processor/output/EncryptOutputProcessor.java | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ws-security-common/src/main/java/org/apache/wss4j/common/util/AttachmentUtils.java
b/ws-security-common/src/main/java/org/apache/wss4j/common/util/AttachmentUtils.java
index 205c3c5..c2affda 100644
--- a/ws-security-common/src/main/java/org/apache/wss4j/common/util/AttachmentUtils.java
+++ b/ws-security-common/src/main/java/org/apache/wss4j/common/util/AttachmentUtils.java
@@ -497,7 +497,7 @@ public final class AttachmentUtils {
                 }
 
                 AlgorithmParameterSpec paramSpec =
-                    XMLCipherUtil.constructBlockCipherParameters(encAlgo, ivBytes, AttachmentUtils.class);
+                    XMLCipherUtil.constructBlockCipherParameters(encAlgo, ivBytes);
 
                 try {
                     cipher.init(Cipher.DECRYPT_MODE, key, paramSpec);
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 53ff45d..48f2de4 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
@@ -427,7 +427,7 @@ public class Encryptor {
             int ivLen = JCEMapper.getIVLengthFromURI(encryptionAlgorithm) / 8;
             byte[] iv = XMLSecurityConstants.generateBytes(ivLen);
             AlgorithmParameterSpec paramSpec =
-                XMLCipherUtil.constructBlockCipherParameters(encryptionAlgorithm, iv, Encryptor.class);
+                XMLCipherUtil.constructBlockCipherParameters(encryptionAlgorithm, iv);
             cipher.init(Cipher.ENCRYPT_MODE, secretKey, paramSpec);
 
             return cipher;
diff --git a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/EncryptOutputProcessor.java
b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/EncryptOutputProcessor.java
index 32fdb57..50adfd8 100644
--- a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/EncryptOutputProcessor.java
+++ b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/EncryptOutputProcessor.java
@@ -269,7 +269,7 @@ public class EncryptOutputProcessor extends AbstractEncryptOutputProcessor
{
                     int ivLen = JCEMapper.getIVLengthFromURI(encryptionSymAlgorithm) / 8;
                     byte[] iv = XMLSecurityConstants.generateBytes(ivLen);
                     AlgorithmParameterSpec paramSpec =
-                        XMLCipherUtil.constructBlockCipherParameters(encryptionSymAlgorithm,
iv, this.getClass());
+                        XMLCipherUtil.constructBlockCipherParameters(encryptionSymAlgorithm,
iv);
                     cipher.init(Cipher.ENCRYPT_MODE, encryptionPartDef.getSymmetricKey(),
paramSpec);
 
                 } catch (Exception e) {


Mime
View raw message