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 2022/07/19 12:25:24 UTC
[ws-wss4j] branch master updated: Removing unused parameters
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 6bcd40706 Removing unused parameters
6bcd40706 is described below
commit 6bcd40706ac45f902efd618fc57bbee448cf7085
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Jul 19 13:18:59 2022 +0100
Removing unused parameters
---
.../java/org/apache/wss4j/dom/action/AbstractDerivedAction.java | 3 ---
.../java/org/apache/wss4j/dom/action/EncryptionDerivedAction.java | 8 +++-----
.../java/org/apache/wss4j/dom/action/SignatureDerivedAction.java | 8 +++-----
3 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/AbstractDerivedAction.java b/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/AbstractDerivedAction.java
index fba7505ac..49dedfb3f 100644
--- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/AbstractDerivedAction.java
+++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/AbstractDerivedAction.java
@@ -121,10 +121,7 @@ public abstract class AbstractDerivedAction {
protected Element setupEKReference(WSSecDerivedKeyBase derivedKeyBase,
WSSecHeader securityHeader,
- WSPasswordCallback passwordCallback,
SignatureEncryptionActionToken actionToken,
- boolean use200512Namespace,
- Document doc,
String keyTransportAlgorithm,
String mgfAlgorithm,
SecretKey symmetricKey) throws WSSecurityException {
diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/EncryptionDerivedAction.java b/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/EncryptionDerivedAction.java
index a4daaad8f..05345d6fd 100644
--- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/EncryptionDerivedAction.java
+++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/EncryptionDerivedAction.java
@@ -100,7 +100,7 @@ public class EncryptionDerivedAction extends AbstractDerivedAction implements Ac
symmetricKey = keyGen.generateKey();
}
- tokenElement = setupEncryptedKeyTokenReference(reqData, encryptionToken, wsEncrypt, passwordCallback, doc, symmetricKey);
+ tokenElement = setupEncryptedKeyTokenReference(reqData, encryptionToken, wsEncrypt, symmetricKey);
} else if ("SecurityContextToken".equals(derivedKeyTokenReference)) {
tokenElement = setupSCTTokenReference(reqData, encryptionToken, wsEncrypt, passwordCallback, doc);
}
@@ -167,15 +167,13 @@ public class EncryptionDerivedAction extends AbstractDerivedAction implements Ac
private Element setupEncryptedKeyTokenReference(
RequestData reqData, EncryptionActionToken encryptionToken,
- WSSecDKEncrypt wsEncrypt, WSPasswordCallback passwordCallback,
- Document doc, SecretKey symmetricKey
+ WSSecDKEncrypt wsEncrypt, SecretKey symmetricKey
) throws WSSecurityException {
if (symmetricKey == null) {
setupEKReference(wsEncrypt, reqData.getSignatureToken());
return null;
} else {
- return setupEKReference(wsEncrypt, reqData.getSecHeader(), passwordCallback, encryptionToken,
- reqData.isUse200512Namespace(), doc, null, null, symmetricKey);
+ return setupEKReference(wsEncrypt, reqData.getSecHeader(), encryptionToken, null, null, symmetricKey);
}
}
diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SignatureDerivedAction.java b/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SignatureDerivedAction.java
index 813541e09..97d0324aa 100644
--- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SignatureDerivedAction.java
+++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SignatureDerivedAction.java
@@ -102,7 +102,7 @@ public class SignatureDerivedAction extends AbstractDerivedAction implements Act
symmetricKey = keyGen.generateKey();
}
- tokenElement = setupEncryptedKeyTokenReference(reqData, signatureToken, wsSign, passwordCallback, doc, symmetricKey);
+ tokenElement = setupEncryptedKeyTokenReference(reqData, signatureToken, wsSign, symmetricKey);
} else if ("SecurityContextToken".equals(derivedKeyTokenReference)) {
tokenElement = setupSCTTokenReference(reqData, signatureToken, wsSign, passwordCallback, doc);
} else {
@@ -170,16 +170,14 @@ public class SignatureDerivedAction extends AbstractDerivedAction implements Act
private Element setupEncryptedKeyTokenReference(
RequestData reqData, SignatureActionToken signatureToken,
- WSSecDKSign wsSign, WSPasswordCallback passwordCallback,
- Document doc, SecretKey symmetricKey
+ WSSecDKSign wsSign, SecretKey symmetricKey
) throws WSSecurityException {
if (symmetricKey == null) {
setupEKReference(wsSign, reqData.getEncryptionToken());
return null;
} else {
- return setupEKReference(wsSign, reqData.getSecHeader(), passwordCallback, signatureToken,
- reqData.isUse200512Namespace(), doc, null, null, symmetricKey);
+ return setupEKReference(wsSign, reqData.getSecHeader(), signatureToken, null, null, symmetricKey);
}
}