From: Stig Palmquist <stig@stig.io>
To: notmuch@notmuchmail.org
Subject: [PATCH] test: fix support for gpgsm in gnupg 2.3
Date: Tue, 11 Jan 2022 14:12:45 +0100 [thread overview]
Message-ID: <87o84iza9r.fsf@starbuck.i-did-not-set--mail-host-address--so-tickle-me> (raw)
gpgsm --list-keys output changed the label for fingerprints from
"fingerprint: " to "sha[12] fpr: " breaking tests with gnupg 2.3. this
adds support for both.
---
test/test-lib.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/test-lib.sh b/test/test-lib.sh
index 6bc0b723..3de608f9 100644
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@ -145,7 +145,7 @@ add_gpgsm_home () {
mkdir -p -m 0700 "$GNUPGHOME"
gpgsm --batch --no-tty --no-common-certs-import --pinentry-mode=loopback --passphrase-fd 3 \
--disable-dirmngr --import >"$GNUPGHOME"/import.log 2>&1 3<<<'' <$NOTMUCH_SRCDIR/test/smime/0xE0972A47.p12
- fpr=$(gpgsm --batch --list-key test_suite@notmuchmail.org | sed -n 's/.*fingerprint: //p')
+ fpr=$(gpgsm --batch --list-key test_suite@notmuchmail.org | sed -n 's/.*\(fingerprint\|sha1 fpr\): //p')
echo "$fpr S relax" >> "$GNUPGHOME/trustlist.txt"
gpgsm --quiet --batch --no-tty --no-common-certs-import --disable-dirmngr --import < $NOTMUCH_SRCDIR/test/smime/ca.crt
echo "4D:E0:FF:63:C0:E9:EC:01:29:11:C8:7A:EE:DA:3A:9A:7F:6E:C1:0D S" >> "$GNUPGHOME/trustlist.txt"
--
2.34.1
next reply other threads:[~2022-01-11 13:28 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-11 13:12 Stig Palmquist [this message]
2022-01-11 14:04 ` [PATCH] test: fix support for gpgsm in gnupg 2.3 David Bremner
2022-01-11 23:52 ` [PATCH] test/gpgsm: use --with-colons when calculating fingerprint David Bremner
[not found] ` <20220112163817.teztj5t4wwcqmbew@stig.io>
2022-01-12 16:39 ` Stig Palmquist
2022-01-12 17:27 ` David Bremner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87o84iza9r.fsf@starbuck.i-did-not-set--mail-host-address--so-tickle-me \
--to=stig@stig.io \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).