From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id qHOKJ5OO3WFn6wAAgWs5BA (envelope-from ) for ; Tue, 11 Jan 2022 15:05:07 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id ACsGJJOO3WH0UwAAauVa8A (envelope-from ) for ; Tue, 11 Jan 2022 15:05:07 +0100 Received: from mail.notmuchmail.org (yantan.tethera.net [IPv6:2a01:4f9:c011:7a79::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 4F5A730AD5 for ; Tue, 11 Jan 2022 15:05:07 +0100 (CET) Received: from yantan.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id 399E25F749; Tue, 11 Jan 2022 14:05:03 +0000 (UTC) Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) by mail.notmuchmail.org (Postfix) with ESMTP id 161C15F731 for ; Tue, 11 Jan 2022 14:05:00 +0000 (UTC) Received: by fethera.tethera.net (Postfix, from userid 1001) id 016935FC51; Tue, 11 Jan 2022 09:04:58 -0500 (EST) Received: (nullmailer pid 312669 invoked by uid 1000); Tue, 11 Jan 2022 14:04:57 -0000 From: David Bremner To: Stig Palmquist , notmuch@notmuchmail.org Subject: Re: [PATCH] test: fix support for gpgsm in gnupg 2.3 In-Reply-To: <87o84iza9r.fsf@starbuck.i-did-not-set--mail-host-address--so-tickle-me> References: <87o84iza9r.fsf@starbuck.i-did-not-set--mail-host-address--so-tickle-me> Date: Tue, 11 Jan 2022 10:04:57 -0400 Message-ID: <87lezmz7ue.fsf@tethera.net> MIME-Version: 1.0 Message-ID-Hash: IW2BAEKOBI3M3Q42XRTQZYCPQ4JWLWNR X-Message-ID-Hash: IW2BAEKOBI3M3Q42XRTQZYCPQ4JWLWNR X-MailFrom: david@tethera.net X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-notmuch.notmuchmail.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.3 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_IN X-Migadu-Country: DE ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1641909907; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-owner:list-unsubscribe:list-subscribe:list-post; bh=lhl+AVal3bS99iklRaa7x9pbcbedZq6+KoggOfZDRnI=; b=PnuyePYzKv8iRlnfoReM3WcKu/r9udOtrP8wmGsRrMK05tEAbN7MyyJ9+UhVrGAbDQeGsW u/3MEAKUy1AzdkNql4fBtchM/L5mm9L/MymfX2Bf0s9do1pyGOIM6b8+R7EBCQv0G0v/yo N8hCdWpfQ1ijmc3U8zT2fo/rNLUWaL/OXzgPtgtLoqV1AOp1CzcwKnaOAx+UwL85SD4LQf 5xZ9AEidDeMIg9TGCnlQtF7PSm3NO4a2MjJJyBHp322vHbTkb175thvqcIsDQDRrrqqHnL GQ8JL1xJeNNpaTThrVC3NKFRKexIoUspXXDdtmJlDFX0oKaaBA+B1vEN/X6hXA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1641909907; a=rsa-sha256; cv=none; b=NgJ6V/bPuzLnt5bVtnN/L24A+j0widQFAMU9733mgAdGm8ZDhqjNn0UzkClx6s1uD64rYA 24hmFKadrUOnlkoltTeM/1rNGlVT8fsMt3JKN0Sh1p383ZEjwdS7PPAF1GYK8MhGfdYeXh U2tz8TTEO2ou1YdEParp9peCD7XfJm8Yf/3JZC+/jPS9BN+cYacij7rPbak4i/7mhGSDkv O0aCz5sapUEo5+fjESxxgNn6dYgAIXfNvFpl+ZtAntemQQUySOXQCPnGXyPhSbWlwBf2NH EGV8v2+TNLH39vYMGprCoxEPBHwtS/IfIyhA3eVCmqK4JZUMEg/V2VTMhYT2qw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 2a01:4f9:c011:7a79::1 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Spam-Score: -2.11 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 2a01:4f9:c011:7a79::1 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Queue-Id: 4F5A730AD5 X-Spam-Score: -2.11 X-Migadu-Scanner: scn1.migadu.com X-TUID: nGruJkA9OrPn Stig Palmquist writes: > 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') Thanks for the patch. It occurs to me that we should probably use --with-colons to avoid future issues like this. It looks like we wabt the row labelled "fpr"; I assume this has not changed with 2.3? d