From 7978fdc1476a5c6ae836d975f259928eac914318 Mon Sep 17 00:00:00 2001 From: chriseth Date: Wed, 18 Jan 2017 11:50:10 +0100 Subject: [PATCH] Fix decryption. --- .travis.yml | 3 ++- ci/deploy_from_travis.sh | 16 ++++++++++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index b54130c5b0..723fd11bd5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,8 @@ deploy: branch: master env: global: - - ENCRYPTION_LABEL="b5c2730599da" + - ENCRYPTION_LABEL1="b5c2730599da" + - ENCRYPTION_LABEL2="85f76a180658" - COMMIT_AUTHOR_EMAIL="chris@ethereum.org" - COMMIT_AUTHOR="Travis CI" - FILES_TO_PACKAGE="assets background.js build icon.png index.html manifest.json README.md soljson.js" diff --git a/ci/deploy_from_travis.sh b/ci/deploy_from_travis.sh index 290d7add02..90b629e1b0 100755 --- a/ci/deploy_from_travis.sh +++ b/ci/deploy_from_travis.sh @@ -17,16 +17,20 @@ zip -r remix-$SHA.zip $FILES_TO_PACKAGE git add -f $FILES_TO_PACKAGE remix-$SHA.zip git commit -m "Built website from {$SHA}." -ENCRYPTED_KEY_VAR="encrypted_${ENCRYPTION_LABEL}_key" -ENCRYPTED_IV_VAR="encrypted_${ENCRYPTION_LABEL}_iv" -ENCRYPTED_KEY=${!ENCRYPTED_KEY_VAR} -ENCRYPTED_IV=${!ENCRYPTED_IV_VAR} +ENCRYPTED_KEY_VAR1="encrypted_${ENCRYPTION_LABEL1}_key" +ENCRYPTED_IV_VAR1="encrypted_${ENCRYPTION_LABEL1}_iv" +ENCRYPTED_KEY1=${!ENCRYPTED_KEY_VAR1} +ENCRYPTED_IV1=${!ENCRYPTED_IV_VAR1} +ENCRYPTED_KEY_VAR2="encrypted_${ENCRYPTION_LABEL2}_key" +ENCRYPTED_IV_VAR2="encrypted_${ENCRYPTION_LABEL2}_iv" +ENCRYPTED_KEY2=${!ENCRYPTED_KEY_VAR2} +ENCRYPTED_IV2=${!ENCRYPTED_IV_VAR2} touch deploy_key touch deploy_key_remix-live chmod 600 deploy_key deploy_key_remix-live -openssl aes-256-cbc -K $ENCRYPTED_KEY -iv $ENCRYPTED_IV -in ci/deploy_key.enc -out deploy_key -d -openssl aes-256-cbc -K $ENCRYPTED_KEY -iv $ENCRYPTED_IV -in ci/deploy_key_remix-live.enc -out deploy_key_remix-live -d +openssl aes-256-cbc -K $ENCRYPTED_KEY1 -iv $ENCRYPTED_IV1 -in ci/deploy_key.enc -out deploy_key -d +openssl aes-256-cbc -K $ENCRYPTED_KEY2 -iv $ENCRYPTED_IV2 -in ci/deploy_key_remix-live.enc -out deploy_key_remix-live -d eval `ssh-agent -s` ssh-add deploy_key ssh-add deploy_key_remix-live