NIFI-12094 This closes apache#7767. Removed EncryptContent and Crypto…

…graphicHashAttribute - Removed CipherProvider interface and implementations from nifi-security-utils Signed-off-by: Joseph Witt <[email protected]>
nexr · Sep 20, 2023 · 2602e16 · 2602e16
1 parent e5894cf
commit 2602e16
Show file tree

Hide file tree

Showing 64 changed files with 5 additions and 11,484 deletions.
diff --git a/minifi/minifi-docs/src/main/markdown/minifi-java-agent-quick-start.md b/minifi/minifi-docs/src/main/markdown/minifi-java-agent-quick-start.md
@@ -162,7 +162,6 @@ MiNiFi is able to use the following processors out of the box:
 * ControlRate
 * ConvertCharacterSet
 * DuplicateFlowFile
-* EncryptContent
 * EvaluateJsonPath
 * EvaluateRegularExpression
 * EvaluateXPath

diff --git a/...ons/nifi-security-utils/src/main/java/org/apache/nifi/security/util/EncryptionMethod.java b/...ons/nifi-security-utils/src/main/java/org/apache/nifi/security/util/EncryptionMethod.java
diff --git a/...rity-utils/src/main/java/org/apache/nifi/security/util/crypto/AESKeyedCipherProvider.java b/...rity-utils/src/main/java/org/apache/nifi/security/util/crypto/AESKeyedCipherProvider.java
diff --git a/...curity-utils/src/main/java/org/apache/nifi/security/util/crypto/AbstractSecureHasher.java b/...curity-utils/src/main/java/org/apache/nifi/security/util/crypto/AbstractSecureHasher.java
@@ -22,6 +22,7 @@
 
 import java.nio.charset.StandardCharsets;
 import java.security.SecureRandom;
+import java.util.Base64;
 
 public abstract class AbstractSecureHasher implements SecureHasher {
     private static final Logger logger = LoggerFactory.getLogger(AbstractSecureHasher.class);
@@ -185,7 +186,7 @@ public String hashBase64(String input) {
             return "";
         }
 
-        return CipherUtility.encodeBase64NoPadding(hash(input.getBytes(StandardCharsets.UTF_8)));
+        return Base64.getEncoder().withoutPadding().encodeToString(hash(input.getBytes(StandardCharsets.UTF_8)));
     }
 
     /**
@@ -204,7 +205,7 @@ public String hashBase64(String input, String salt) {
             return "";
         }
 
-        return CipherUtility.encodeBase64NoPadding(hash(input.getBytes(StandardCharsets.UTF_8), salt.getBytes(StandardCharsets.UTF_8)));
+        return Base64.getEncoder().withoutPadding().encodeToString(hash(input.getBytes(StandardCharsets.UTF_8), salt.getBytes(StandardCharsets.UTF_8)));
     }
 
     /**