From 4bc97049abb07fcc11cee6ca71daf9375d8137da Mon Sep 17 00:00:00 2001 From: "tlimoncelli@stackoverflow.com" Date: Sun, 14 May 2017 18:48:59 -0400 Subject: [PATCH] tools/confidence_test.sh: now works with gnupg-2.0 and gnupg-2.1 --- bin/_blackbox_common.sh | 9 ++++++++- tools/confidence_test.sh | 9 ++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/bin/_blackbox_common.sh b/bin/_blackbox_common.sh index 3249599..c227136 100755 --- a/bin/_blackbox_common.sh +++ b/bin/_blackbox_common.sh @@ -163,8 +163,15 @@ function get_encrypted_filename() { # Prepare keychain for use. function prepare_keychain() { + local keyringasc echo '========== Importing keychain: START' >&2 - $GPG --import "$(get_pubring_path)" 2>&1 | egrep -v 'not changed$' >&2 + # Works with gpg 2.0 + #$GPG --import "$(get_pubring_path)" 2>&1 | egrep -v 'not changed$' >&2 + # Works with gpg 2.0 and 2.1 + # NB: We must export the keys to a format that can be imported. + make_self_deleting_tempfile keyringasc + $GPG --export --keyring "$(get_pubring_path)" >"$keyringasc" + $GPG --import "$keyringasc" echo '========== Importing keychain: DONE' >&2 } diff --git a/tools/confidence_test.sh b/tools/confidence_test.sh index 6619ec0..1f25be9 100755 --- a/tools/confidence_test.sh +++ b/tools/confidence_test.sh @@ -116,8 +116,8 @@ PHASE 'Alice does the second part to enroll bob.' become_alice PHASE 'She enrolls bob.' -gpg --import $(get_pubring_path) -# TODO(tlim) That --import can be eliminated... maybe? +#gpg --import $(get_pubring_path) +## TODO(tlim) That --import can be eliminated... maybe? PHASE 'She enrolls secrets.txt.' blackbox_register_new_file secret.txt @@ -185,9 +185,8 @@ assert_file_md5hash secret.txt "d3e6bbdfc76fae7fd0a921f3408db1d1" PHASE 'appears.' become_bob -PHASE 'Bob makes sure he has all new keys.' - -gpg --import keyrings/live/pubring.??? +#PHASE 'Bob makes sure he has all new keys.' +#gpg --import keyrings/live/pubring.??? # Pick a GID to use: # This users's default group: