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

Improve GPG 1.x compatibility.

Browse Source
This commit is contained in:
tlimoncelli@stackexchange.com
2015-06-15 20:33:50 +00:00
parent a3fc4cbf4a
commit 33429b3ca6
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

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