28 lines
1.3 KiB
Diff
28 lines
1.3 KiB
Diff
From a642ad542e3d3f34e949c5c66923ca8a6e6cbbd8 Mon Sep 17 00:00:00 2001
|
|
From: Stig Palmquist <stig@stig.io>
|
|
Date: Tue, 11 Jan 2022 13:23:13 +0100
|
|
Subject: [PATCH] test: fix support for gpgsm in gnupg 2.3
|
|
|
|
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
|
|
|