aboutsummaryrefslogtreecommitdiffstats
path: root/deployment/heat/onap-oom/scripts/deploy.sh
diff options
context:
space:
mode:
authorMarco Platania <platania@research.att.com>2019-03-19 15:22:58 -0400
committerGary Wu <gary.i.wu@huawei.com>2019-03-19 12:32:32 -0700
commitab8cd68e52570cd75096629b9db37f23ae0589b8 (patch)
tree731e51e69453e6f13d54be5dd41d6284a3885938 /deployment/heat/onap-oom/scripts/deploy.sh
parent114c21c9ff09fd80851e8419b575ea75f5e0a206 (diff)
Update cloud pwd encryption mechanism
Change-Id: I7a311d62d7d5cd5d38dc01250a7e327a9eeac267 Issue-ID: INT-988 Signed-off-by: Marco Platania <platania@research.att.com> Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
Diffstat (limited to 'deployment/heat/onap-oom/scripts/deploy.sh')
-rwxr-xr-xdeployment/heat/onap-oom/scripts/deploy.sh9
1 files changed, 8 insertions, 1 deletions
diff --git a/deployment/heat/onap-oom/scripts/deploy.sh b/deployment/heat/onap-oom/scripts/deploy.sh
index 7977c6a55..264152f76 100755
--- a/deployment/heat/onap-oom/scripts/deploy.sh
+++ b/deployment/heat/onap-oom/scripts/deploy.sh
@@ -111,8 +111,15 @@ SSH_KEY=~/.ssh/onap_key
source $WORKSPACE/test/ete/scripts/install_openstack_cli.sh
+#SO_ENCRYPTION_KEY=aa3871669d893c7fb8abbcda31b88b4f
+#export OS_PASSWORD_ENCRYPTED=$(echo -n "$OS_PASSWORD" | openssl aes-128-ecb -e -K "$SO_ENCRYPTION_KEY" -nosalt | xxd -c 256 -p)
+
+#Use new encryption method
+pushd $WORKSPACE/deployment/heat/onap-oom/scripts
+javac Crypto.java
SO_ENCRYPTION_KEY=aa3871669d893c7fb8abbcda31b88b4f
-export OS_PASSWORD_ENCRYPTED=$(echo -n "$OS_PASSWORD" | openssl aes-128-ecb -e -K "$SO_ENCRYPTION_KEY" -nosalt | xxd -c 256 -p)
+export OS_PASSWORD_ENCRYPTED=$(java Crypto "$OS_PASSWORD" "$SO_ENCRYPTION_KEY")
+popd
for n in $(seq 1 5); do
if [ $full_deletion = true ] ; then