george/blackbox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #64 from onyxraven/use_agent

Browse Source 
use agent for encrypt-decrypt
This commit is contained in:
Tom Limoncelli
2015-03-22 09:42:00 -04:00
parent a154c7546a 120f3cb42b
commit ea72a7cd04
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bin/_blackbox_common.sh
View File

@@ -169,7 +169,7 @@ function encrypt_file() {
encrypted="$2" encrypted="$2"
echo "========== Encrypting: $unencrypted" echo "========== Encrypting: $unencrypted"
gpg --yes --trust-model=always --encrypt -o "$encrypted" $(awk '{ print "-r" $1 }' < "$BB_ADMINS") "$unencrypted" gpg --use-agent --yes --trust-model=always --encrypt -o "$encrypted" $(awk '{ print "-r" $1 }' < "$BB_ADMINS") "$unencrypted"
echo '========== Encrypting: DONE' echo '========== Encrypting: DONE'
} }
@@ -185,7 +185,7 @@ function decrypt_file() {
old_umask=$(umask) old_umask=$(umask)
umask "$DECRYPT_UMASK" umask "$DECRYPT_UMASK"
gpg -q --decrypt -o "$unencrypted" "$encrypted" gpg --use-agent -q --decrypt -o "$unencrypted" "$encrypted"
umask "$old_umask" umask "$old_umask"
} }
@@ -207,7 +207,7 @@ function decrypt_file_overwrite() {
old_umask=$(umask) old_umask=$(umask)
umask "$DECRYPT_UMASK" umask "$DECRYPT_UMASK"
gpg --yes -q --decrypt -o "$unencrypted" "$encrypted" gpg --use-agent --yes -q --decrypt -o "$unencrypted" "$encrypted"
umask "$old_umask" umask "$old_umask"
new_hash=$(md5sum_file "$unencrypted") new_hash=$(md5sum_file "$unencrypted")