X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=test%2Ftest-lib.sh;fp=test%2Ftest-lib.sh;h=32f710a58576a52f8ad62ae3429ec4bbe37a0c94;hp=dc4962f560b6dc48dcf0de22fd7f25ac3903e832;hb=4760b4470c5d5782e52bd1a7761d9975a1db1fec;hpb=8e59438025c88ebd83a78cf12c06ff954d979e01

diff --git a/test/test-lib.sh b/test/test-lib.sh
index dc4962f5..32f710a5 100644
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@ -143,10 +143,8 @@ add_gpgsm_home () {
     _gnupg_exit () { gpgconf --kill all 2>/dev/null || true; }
     at_exit_function _gnupg_exit
     mkdir -p -m 0700 "$GNUPGHOME"
-    openssl pkcs12 -export -passout pass: -inkey "$NOTMUCH_SRCDIR/test/smime/key+cert.pem" \
-	< "$NOTMUCH_SRCDIR/test/smime/test.crt" | \
-	gpgsm --batch --no-tty --no-common-certs-import --pinentry-mode=loopback --passphrase-fd 3 \
-	      --disable-dirmngr --import  >"$GNUPGHOME"/import.log 2>&1 3<<<''
+    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')
     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