ws-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [ws-wss4j] branch 2_4_x-fixes updated: Removing some problematic language
Date Mon, 30 Aug 2021 06:45:23 GMT
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/2_4_x-fixes by this push:
     new 1b14212  Removing some problematic language
1b14212 is described below

commit 1b14212d069a44831caf42c2e1a3db92df5fdbbc
Author: Colm O hEigeartaigh <coheigea@apache.org>
AuthorDate: Mon Aug 30 07:44:52 2021 +0100

    Removing some problematic language
---
 .../java/org/apache/wss4j/common/ConfigurationConstants.java |  4 ++--
 .../org/apache/wss4j/common/cache/EHCacheReplayCache.java    |  2 +-
 .../apache/wss4j/common/crypto/JasyptPasswordEncryptor.java  | 12 ++++++------
 .../org/apache/wss4j/common/saml/bean/AttributeBean.java     |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/ws-security-common/src/main/java/org/apache/wss4j/common/ConfigurationConstants.java
b/ws-security-common/src/main/java/org/apache/wss4j/common/ConfigurationConstants.java
index 85208c3..31a21dc 100644
--- a/ws-security-common/src/main/java/org/apache/wss4j/common/ConfigurationConstants.java
+++ b/ws-security-common/src/main/java/org/apache/wss4j/common/ConfigurationConstants.java
@@ -914,8 +914,8 @@ public class ConfigurationConstants {
      * decrypt passwords in the Merlin Crypto implementation (or any custom Crypto implementations).
      *
      * By default, WSS4J uses the JasyptPasswordEncryptor, which must be instantiated with
a
-     * master password to use to decrypt keystore passwords in the Merlin Crypto properties
file.
-     * This master password is obtained via the CallbackHandler defined via PW_CALLBACK_CLASS
+     * password to use to decrypt keystore passwords in the Merlin Crypto properties file.
+     * This password is obtained via the CallbackHandler defined via PW_CALLBACK_CLASS
      * or PW_CALLBACK_REF.
      *
      * The encrypted passwords must be stored in the format "ENC(encoded encrypted password)".
diff --git a/ws-security-common/src/main/java/org/apache/wss4j/common/cache/EHCacheReplayCache.java
b/ws-security-common/src/main/java/org/apache/wss4j/common/cache/EHCacheReplayCache.java
index d46bdff..ff46c21 100644
--- a/ws-security-common/src/main/java/org/apache/wss4j/common/cache/EHCacheReplayCache.java
+++ b/ws-security-common/src/main/java/org/apache/wss4j/common/cache/EHCacheReplayCache.java
@@ -64,7 +64,7 @@ public class EHCacheReplayCache implements ReplayCache {
         this.diskstorePath = diskstorePath;
         this.persistent = persistent;
 
-        // Do some sanity checking on the arguments
+        // Do some checking on the arguments
         if (key == null || persistent && diskstorePath == null) {
             throw new NullPointerException();
         }
diff --git a/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/JasyptPasswordEncryptor.java
b/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/JasyptPasswordEncryptor.java
index 8f86b77..e418ac9 100644
--- a/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/JasyptPasswordEncryptor.java
+++ b/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/JasyptPasswordEncryptor.java
@@ -43,13 +43,13 @@ public class JasyptPasswordEncryptor implements PasswordEncryptor {
     private final StandardPBEStringEncryptor passwordEncryptor;
     private CallbackHandler callbackHandler;
 
-    public JasyptPasswordEncryptor(String masterPassword) {
-        this(masterPassword, DEFAULT_ALGORITHM);
+    public JasyptPasswordEncryptor(String password) {
+        this(password, DEFAULT_ALGORITHM);
     }
 
-    public JasyptPasswordEncryptor(String masterPassword, String algorithm) {
+    public JasyptPasswordEncryptor(String password, String algorithm) {
         passwordEncryptor = new StandardPBEStringEncryptor();
-        passwordEncryptor.setPassword(masterPassword);
+        passwordEncryptor.setPassword(password);
         passwordEncryptor.setAlgorithm(algorithm);
     }
 
@@ -75,7 +75,7 @@ public class JasyptPasswordEncryptor implements PasswordEncryptor {
             try {
                 callbackHandler.handle(new Callback[]{pwCb});
             } catch (IOException | UnsupportedCallbackException e) {
-                LOG.debug("Error in getting master password: ", e);
+                LOG.debug("Error in getting password: ", e);
             }
             if (pwCb.getPassword() != null) {
                 passwordEncryptor.setPassword(pwCb.getPassword());
@@ -96,7 +96,7 @@ public class JasyptPasswordEncryptor implements PasswordEncryptor {
             try {
                 callbackHandler.handle(new Callback[]{pwCb});
             } catch (IOException | UnsupportedCallbackException e) {
-                LOG.debug("Error in getting master password: ", e);
+                LOG.debug("Error in getting password: ", e);
             }
             if (pwCb.getPassword() != null) {
                 passwordEncryptor.setPassword(pwCb.getPassword());
diff --git a/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AttributeBean.java
b/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AttributeBean.java
index 2abb77c..3b1aa4c 100644
--- a/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AttributeBean.java
+++ b/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AttributeBean.java
@@ -72,7 +72,7 @@ public class AttributeBean {
     /**
      * Method getNameFormat returns the nameFormat of this SamlAttribute object
      *
-     * @return he nameFormat of this SamlAttribute object
+     * @return the nameFormat of this SamlAttribute object
      */
     public String getNameFormat() {
         return nameFormat;

Mime
View raw message