From cb4d6de58c0fa2ab9a1b798efd184fc269ecc239 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Wed, 28 Jan 2015 16:24:55 +0100 Subject: 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. --- tests/t0300-reencryption.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests') 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 -- cgit v1.2.3