aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Smokowski <ss835w@att.com>2020-01-21 14:05:30 +0000
committerGerrit Code Review <gerrit@onap.org>2020-01-21 14:05:30 +0000
commitb6fc1fc1f2e4242a83a52581b7d6d05c7a7cd201 (patch)
treee49536f5ed2fa5d27bcccfb18a308489219cac5c
parent3ec71c0b73eda99d3ed3ddcddbb9d5619415b6fd (diff)
parent6dba1f2d0b577620593c57df9e2dc9e9b59c7804 (diff)
Merge "Encryption and decryption of OpenStack Passwords removed"
-rw-r--r--common/src/main/java/org/onap/so/utils/CryptoUtils.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/common/src/main/java/org/onap/so/utils/CryptoUtils.java b/common/src/main/java/org/onap/so/utils/CryptoUtils.java
index ff69e3e4b1..1c38dfb774 100644
--- a/common/src/main/java/org/onap/so/utils/CryptoUtils.java
+++ b/common/src/main/java/org/onap/so/utils/CryptoUtils.java
@@ -76,6 +76,8 @@ public final class CryptoUtils {
* @throws GeneralSecurityException
*/
public static String decrypt(String message, String keyString) throws GeneralSecurityException {
+ if (message.equals(System.getenv("PLAINTEXTPASSWORD")))
+ return message;
SecretKeySpec sks = getSecretKeySpec(keyString);
byte[] cipherText = hexStringToByteArray(message);
Cipher cipher = Cipher.getInstance(AES_GCM_NO_PADDING);