m-chrzan.xyz
aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2015-01-28 16:24:55 +0100
committerJason A. Donenfeld <Jason@zx2c4.com>2015-01-28 16:25:16 +0100
commitcb4d6de58c0fa2ab9a1b798efd184fc269ecc239 (patch)
tree26beb50861dddea63b348ad4c88d91de192c21d6
parent4ebecb91c609d8c48a10a81aadc3f08186478fb3 (diff)
Revert "Only examine subkeys that are capable of encrypting."
This reverts commit ec8140b0f1a422aad16d41d0c322f3a6ceef74fe. The needed option is only available on GnuPG 2.1, and we need to support GnuPG 2.0 too.
-rwxr-xr-xsrc/password-store.sh2
-rwxr-xr-xtests/t0300-reencryption.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/password-store.sh b/src/password-store.sh
index f98c6e9..f3aebc3 100755
--- a/src/password-store.sh
+++ b/src/password-store.sh
@@ -100,7 +100,7 @@ reencrypt_path() {
IFS=";" eval 'GPG_RECIPIENTS+=( $group )' # http://unix.stackexchange.com/a/92190
unset GPG_RECIPIENTS[$index]
done
- gpg_keys="$($GPG --list-keys --keyid-format long --list-options show-usage "${GPG_RECIPIENTS[@]}" | sed -n 's/sub *.*\/\([A-F0-9]\{16\}\) .*\[[A-Z]\{0,2\}E[A-Z]\{0,2\}\].*/\1/p' | LC_ALL=C sort -u)"
+ gpg_keys="$($GPG --list-keys --keyid-format long "${GPG_RECIPIENTS[@]}" | sed -n 's/sub *.*\/\([A-F0-9]\{16\}\) .*/\1/p' | LC_ALL=C sort -u)"
fi
current_keys="$($GPG -v --no-secmem-warning --no-permission-warning --list-only --keyid-format long "$passfile" 2>&1 | cut -d ' ' -f 5 | LC_ALL=C sort -u)"
diff --git a/tests/t0300-reencryption.sh b/tests/t0300-reencryption.sh
index afa80df..96da41b 100755
--- a/tests/t0300-reencryption.sh
+++ b/tests/t0300-reencryption.sh
@@ -7,7 +7,7 @@ cd "$(dirname "$0")"
INITIAL_PASSWORD="will this password live? a big question indeed..."
canonicalize_gpg_keys() {
- $GPG --list-keys --keyid-format long --list-options show-usage "$@" | sed -n 's/sub *.*\/\([A-F0-9]\{16\}\) .*\[[A-Z]\{0,2\}E[A-Z]\{0,2\}\].*/\1/p' | sort -u
+ $GPG --list-keys --keyid-format long "$@" | sed -n 's/sub *.*\/\([A-F0-9]\{16\}\) .*/\1/p' | sort -u
}
gpg_keys_from_encrypted_file() {
$GPG -v --no-secmem-warning --no-permission-warning --list-only --keyid-format long "$1" 2>&1 | cut -d ' ' -f 5 | sort -u