From patchwork Thu Feb 24 10:06:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabian Stelzer X-Patchwork-Id: 12758285 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7FF23C433FE for ; Thu, 24 Feb 2022 10:06:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233158AbiBXKHN (ORCPT ); Thu, 24 Feb 2022 05:07:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37860 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232889AbiBXKHJ (ORCPT ); Thu, 24 Feb 2022 05:07:09 -0500 Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-eopbgr150048.outbound.protection.outlook.com [40.107.15.48]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F38E2DEAF for ; Thu, 24 Feb 2022 02:06:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=acvGj/72lf7JIo5Dzmox+7VX/UPd/yYsQqWhYG6bI7pNi+o5/KIR2NUuw+6AW6SOm5R5tRw1V422ij5JJCEskiytlfeiNrIUuIyPr4utjCsCzIvTMcf7VysX5GkUukhXNHo1Nz0+L50N8oMleAApCFcQxJDQ6+8cvbICiHAyz1jWnrCxB45JEOlPAnkLySO4BClL0j4z3ZkSxg8774S27oZ0fgjjggAnDZizw3EOdKZcaMHBdFMPCkS68RvM059Sac8okRYgHXeksAO3oPcXoccmHHsHNhzBwzCsqcTdblET9gdtxwZPIefdlfo6ZGO7qdrPQ3nlBRzlDHV5p+2zUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=XAdKFi8RTdNTKKRI4zvahsi3wGL1jpYM2mdYZ/f3sag=; b=OC2QZNLkG3u1pA5P8KLQB4SArpPdNfNUh8ZUQb9/nEwf9Ohm52ZufweENzRM5iC1JtpCw81PfPdPEM9DJFrSW8cwoI0VQMMBHIFhk7w/EU5z8MXfrX2OOJGyMPEHfqB2yerSL+McBf89FI5i+dyJ060tyoi2LW1WZFsKGGu1IgxV2gzJUTD8TjdXk9tqzLPOtvU80VJGAnkMUzmNoL+HCWhpyuCNMwb0GetBmGQaT5i8Zrglm5LQsTeg26o3SMDxcFspxxExhW2ZUUGXrjjr8pWPgaSX0rmH5HWYq1cb6EpIrFlL8thQf+fo9BHsFUpQLWCR1HRXUkPsQk5/7Wwzvw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=gigacodes.de; dmarc=pass action=none header.from=gigacodes.de; dkim=pass header.d=gigacodes.de; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gigacodes.de; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=XAdKFi8RTdNTKKRI4zvahsi3wGL1jpYM2mdYZ/f3sag=; b=EY/AtIkcHl2XOxgpmK12Z7PbLt+5ZNT+LnEp4DNqs9QMTA349xH3176W6ZQRzsGEHXwnSIwRHUvO7VjXRt2CS1RNmqHqkfgid8eMDLUZ6t3Oag2gPugTrvSydMSncj2v6lZQ64lliZX7NYIuI/aWAEw4KHw+6/oMx0+f21P+opI= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=gigacodes.de; Received: from PAXPR10MB4734.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:12e::15) by VE1PR10MB2941.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:803:106::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5017.24; Thu, 24 Feb 2022 10:06:31 +0000 Received: from PAXPR10MB4734.EURPRD10.PROD.OUTLOOK.COM ([fe80::116e:6242:98da:22ba]) by PAXPR10MB4734.EURPRD10.PROD.OUTLOOK.COM ([fe80::116e:6242:98da:22ba%7]) with mapi id 15.20.5017.024; Thu, 24 Feb 2022 10:06:31 +0000 From: Fabian Stelzer To: git@vger.kernel.org Cc: Fabian Stelzer , Henning Schild , "brian m . carlson" , Hans Jerry Illikainen , Junio C Hamano , Todd Zullinger Subject: [PATCH 1/3] gpg-interface/gpgsm: fix for v2.3 Date: Thu, 24 Feb 2022 11:06:26 +0100 Message-Id: <20220224100628.612789-1-fs@gigacodes.de> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220203123724.47529-1-fs@gigacodes.de> References: <20220203123724.47529-1-fs@gigacodes.de> X-ClientProxiedBy: AM6P193CA0106.EURP193.PROD.OUTLOOK.COM (2603:10a6:209:88::47) To PAXPR10MB4734.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:12e::15) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: baddc4cd-80ad-4f92-c2c3-08d9f77d54da X-MS-TrafficTypeDiagnostic: VE1PR10MB2941:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jmLnSzrzjPEz1Uw5Ur/ey7o3iZDC4eZFqlPRqtignP+Sgz/eNUmSRT5l7fSoc1QELb5t6MSJOcqpwWswVyMl0XFLZMbPBL1LkxYAhI3v9G05YgEr9o3V8M3mSpICBCGVM0lmDh/v40hrnmaQKBLk48sZn9Qn9O/jAmxX3F0OTzLmg14EVotWALXgbzrUwxEYC9nH08nryXOiJvyj+kZUJ9nUZVkz06TJmKIXt1ktfchsOzvIn2SIwaVsRQ8GpzxqQCKmXA1l3eBaAUHdwTcGiHtb/4qUFVtvxuerMD5F/6601nL87Qu6xkPgUEEJEkMjiyPkuY7mKnqups6/RIoFs0HaJqanZkTWpneZ0mOkmVlReCa1RxYFEZpvz0WrNHOSpdeANxDb+fCTvShhEWltTqM+FafjqE1C41++y1V7VEeJXB0oNdADoWLKFRpWXM70SDh2z0VGDm4aOo4LHGeyPvCHkQ6NEoZzenA6su5SKtu+wnu/DWWHDLJVsfeHg0pbwRYnb5/Mm0j/lAU0Cb5lDUujJaijA6oHFy4yVmWP9F3yqPlwlSZwTjpQ20Kb9G0X2p5T/Lhw/9Icij2qGHTTJf12m7BmuK3cIMZy+sWAr0HBLZwP79CYvv8GDlmVpPVfr6bacCB+kB40TjVyZYFo7A== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAXPR10MB4734.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230001)(4636009)(39840400004)(396003)(136003)(366004)(376002)(346002)(83380400001)(26005)(86362001)(2906002)(1076003)(66946007)(66556008)(186003)(8676002)(8936002)(66476007)(4326008)(6506007)(6666004)(5660300002)(2616005)(6486002)(38100700002)(54906003)(36756003)(316002)(6916009)(508600001)(6512007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 6hne+bYx3/TYUlzcowugWcJ3khmMNVuNXZdbRGOMI1SNASeKYqPaSVa+hKT2EcMnQXzUKAWE+ixPUL6P539ykYlow2cG1i8e4KoO5uGoNrLGB/KlLMs/WKJsFgrpGb1+sTEwwdMVFI+RkjLZBbFajwKs+uqnmtDmFze4y8uznQN+OvByjP6XFM4cSI0znqQNhdfjSSj4wZYK0l8O4TKN+OvFRAWOaypqA3u1gPQySdKqZPRI3IsEmy5w8bWB36fbmVPVfbA8zs9hkL5qg2N+g/79TnbDoesU8rcCD3jWwMHmVIO9mPtAQu+4HaFNTjYD9SxrQcQZMeQ+If3ptiA1yZOOg8nFQwajs9NxD2QQe4t2KbitjsDttmkIMRxXb+7uaNTHA3AL6KESYNwd11SmM0YYwOOHCWLB/uI55RpSRrAuiKGUYZ8LW737jEqhcg3Hb1d8djo7YeSRtGXh0xPLxAArTrgKCIdpY9I11av143TWWeA/TbitmFcbixqQARYDqS6O2ds3NPDDTIHjjO4eY38IMr951D3Id8ou8+QJU4AfZ1J5WUKamALBNwzfiaR8UWSQ2cXdOZTMG2h3zVIBcLTOKZMn6rRdlQZ/n2fYyqNE/GiANGGYo+QG/Op0DpwlSSje54AMbJKiC1DxoLvfxoHPMIPhCF4cexcGaWgq0pNC+ZiNfvhj9+BToAahqXaFRTMHjDqFcCHUcXFdHsbjREnxr83a9M/0bIlx24QwAa3PBOgBxdGMeQ5xQ3/bK64iXzEGaP7ZbivXPbySGiN+4mBbXB/OEKxwDBap0LYVhVUtHZVOG6INiOLj6Y0TxrBvql10UUQ4UaUfD5A08lXzqvUSTx5H+71m2tF9AnuavfgLX67aWELXtfUrpSHpt2EhfC3ftM20BZModkxL1l1gvDleyP9j5bAdFqJ19v/gA7kidi3OW6RmlDWpNbP6eLcCX03A8aG2zc7zn/ZsAzkak7GYCHqCUHBYx71ygf7xpoLIfVe8YibOxGp5gKdXJcMIHaki4Er64vnwRFeQajHyUcEcff8PpEtKRFNEnWZV84hhaU+Z1dsFOVAsBc9lGYj3zMoMdXkwZVRfqFyBxun+UDBP0o+NlDlYW1JHemGat1qRVh3+5ZTf3LkDEO9Hzr3jnVAiHEkZBK8U2CgvBdn7sF+eUEBza7zB8R82GY++gwX0D3ADUbPPVp5d983rjTALWcInWHo2RdK6N9tsSsRfUmpLtW7O25Ppq6SbguIagODhN5O0891SZiJt0pCaERA76QnMkwnH0+Y82+IHf1kfAOZcmKWZjvu9JJWT85RbpF5mUYy5D6IuzsVvSIdVGLc3MD92KZnGQhQOIJwzNwVK9vf72iwoQ0zKXbEHulibn1zleh8qQ6lLdCCvqBPvGLOtNKnMD4Mh8D+pDiwDNIpEF2utXYcvk1W4btVN62EOoT5/P61O8TICp78J0W7MdoLmdALDVNYDXHtUFE7uvjlALeTP08JiHYCHltuej4vQ9b3nneqOqZS9UdXrvKJMqJSYd93ZuwOUccWL66GOxqQ/WzB6JmIgnL4FYi3FwvfDyHAMrGzE/JimRtRq/QS8+ehTl9Fl/iZSA7Va72cwzqHzq3HckE22CB7WJf/Bc/lWHA66HCqa70ulsGuh31QSxQ8nPc6svq6nb830N3g8P70HVn0XC1eBwGtZaujYaP2Z+kI= X-OriginatorOrg: gigacodes.de X-MS-Exchange-CrossTenant-Network-Message-Id: baddc4cd-80ad-4f92-c2c3-08d9f77d54da X-MS-Exchange-CrossTenant-AuthSource: PAXPR10MB4734.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Feb 2022 10:06:31.7949 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 80e41b3b-ea1f-4dbc-91eb-225a572951fb X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 0qjN7Rca5ZJ7JrSnNaOjH7+SObE2PaCxlNccbX/y5zx5u481ngch9Lnni56sz53ZUcEwR3lIlat4SB9qSw5Q2cucOGUY/bBaZbffeBELOXY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR10MB2941 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org gpgsm v2.3 changed some details about its output: - instead of displaying `fingerprint:` for keys it will print `sha1 fpr:` and `sha2 fpr:` - some wording of errors has changed - signing will omit an extra debug output line before the [GNUPG]: tag This change adjusts the gpgsm test prerequisite to work with v2.3 as well by accepting `sha1 fpr:` as well as `fingerprint:`. To make this parsing more robust switch to gpg's `--with-colons` output format. Also allow both variants of errors for unknown certs. Checking if signing was successful will now accept '[GNUPG]: SIG_CREATED' on any beginning of a line. Not just explictly the second one anymore. Helped-By: Junio C Hamano Helped-By: Todd Zullinger --- gpg-interface.c | 9 ++++++++- t/lib-gpg.sh | 8 +++----- t/t4202-log.sh | 2 +- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/gpg-interface.c b/gpg-interface.c index 17b1e44baa..94abb3090b 100644 --- a/gpg-interface.c +++ b/gpg-interface.c @@ -934,6 +934,7 @@ static int sign_buffer_gpg(struct strbuf *buffer, struct strbuf *signature, struct child_process gpg = CHILD_PROCESS_INIT; int ret; size_t bottom; + const char *cp; struct strbuf gpg_status = STRBUF_INIT; strvec_pushl(&gpg.args, @@ -953,7 +954,13 @@ static int sign_buffer_gpg(struct strbuf *buffer, struct strbuf *signature, signature, 1024, &gpg_status, 0); sigchain_pop(SIGPIPE); - ret |= !strstr(gpg_status.buf, "\n[GNUPG:] SIG_CREATED "); + for (cp = gpg_status.buf; + cp && (cp = strstr(cp, "[GNUPG:] SIG_CREATED ")); + cp++) { + if (cp == gpg_status.buf || cp[-1] == '\n') + break; /* found */ + } + ret |= !cp; strbuf_release(&gpg_status); if (ret) return error(_("gpg failed to sign the data")); diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh index 3e7ee1386a..e997ce10ea 100644 --- a/t/lib-gpg.sh +++ b/t/lib-gpg.sh @@ -72,12 +72,10 @@ test_lazy_prereq GPGSM ' --passphrase-fd 0 --pinentry-mode loopback \ --import "$TEST_DIRECTORY"/lib-gpg/gpgsm_cert.p12 && - gpgsm --homedir "${GNUPGHOME}" -K | - grep fingerprint: | - cut -d" " -f4 | - tr -d "\\n" >"${GNUPGHOME}/trustlist.txt" && + gpgsm --homedir "${GNUPGHOME}" -K --with-colons | + awk -F ":" "/^(fpr|fingerprint):/ {printf \"%s S relax\\n\", \$10}" \ + >"${GNUPGHOME}/trustlist.txt" && - echo " S relax" >>"${GNUPGHOME}/trustlist.txt" && echo hello | gpgsm --homedir "${GNUPGHOME}" >/dev/null \ -u committer@example.com -o /dev/null --sign - ' diff --git a/t/t4202-log.sh b/t/t4202-log.sh index 544f0aa82e..493e376e73 100755 --- a/t/t4202-log.sh +++ b/t/t4202-log.sh @@ -2013,7 +2013,7 @@ test_expect_success GPGSM 'log --graph --show-signature for merged tag x509 miss git merge --no-ff -m msg signed_tag_x509_nokey && GNUPGHOME=. git log --graph --show-signature -n1 plain-x509-nokey >actual && grep "^|\\\ merged tag" actual && - grep "^| | gpgsm: certificate not found" actual + grep -Ei "^| | gpgsm:( failed to find the)? certificate:? not found" actual ' test_expect_success GPGSM 'log --graph --show-signature for merged tag x509 bad signature' ' From patchwork Wed Mar 2 09:02:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabian Stelzer X-Patchwork-Id: 12765671 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2B63FC433F5 for ; Wed, 2 Mar 2022 09:03:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240296AbiCBJDs (ORCPT ); Wed, 2 Mar 2022 04:03:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41032 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240307AbiCBJDq (ORCPT ); Wed, 2 Mar 2022 04:03:46 -0500 Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-eopbgr50069.outbound.protection.outlook.com [40.107.5.69]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9091C1CFFA for ; Wed, 2 Mar 2022 01:03:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cwju3pQ1sXg/sM0DgHukDjyOm1fHl3Vo4miOfTNxXvvfetoSSdJdYPMpbjrCoLm04qkmx8iM+T7vxVIfFWOteJ6zR5BEouYzLLqSpfKIzVDLDqUtR2CF1+jr0GN0xxTXxhHnv1E9Fjj1i15jqP5uO5ahTEh3bAmUh9nwfNbEl+pv6PkYxQy2WwNAhQiMp6vSgpAcU2jrfG84kwVuybeaQFFLjClla2iQ+YXm2GQhAy6BYmDOYLSc1bInHCdiBRCQsBdNgWoir08xtBiTTPfBb6P0bd7mZgUP2w6JvMoKfTNzHyvxlG2KCZrtJoGKPR4RhMSDSlRKTCiU4HAZQPvppQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=0gzEmdB7TOjJdgm5yNk4kfNj0jcmrRCgK//WSqqvDLg=; b=CHSaD8P94OXkZEW3V4YNeoi1HXyAXxIIymFWGwqhnZqqA0LHYtJdMoFe5FYasyK71SyQ3Hi2AvajpPMFNmR0ZN8nJH26wipoIBfCIqbuVe/IBYx3P/AVP/j4kLSbxXMpl69QT86WPAyZUxiBC3GTW9LgjExGRr0jeaaSGxAZ1qfV7DiBosEb68LXD6VtLohOV4aLuHmbbBF/I/6fG21ifeJKxZ4nrc4U7jRgN192sqJF4x1CXRtElQnq2451BtYhdxYnq4JzE2w/wLBhtcvddhqpqKHrgKq1UjQtIFm/jdjOulXWUxWammrnXoXusKF7uJ1YTGNxWj/fee7kKNs2NQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=gigacodes.de; dmarc=pass action=none header.from=gigacodes.de; dkim=pass header.d=gigacodes.de; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gigacodes.de; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=0gzEmdB7TOjJdgm5yNk4kfNj0jcmrRCgK//WSqqvDLg=; b=FM/1AXeY15pEf/FaAYbcmqpAjmWrlkc8RhBTSYufQvgIjbyhRkkVln74cM8X9s6eZ1LZuBzz5q2+Lk0zdtt7eNXRJk1cG0B60tx7cv9UCu2O7WGmKTOzKCQ9EVosMK3MMQAqHyLcpKnrQdUkW+q5DWBUTVCNUnbmlIZhKn3VIaw= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=gigacodes.de; Received: from PAXPR10MB4734.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:12e::15) by VI1PR10MB2015.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:803:38::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5017.26; Wed, 2 Mar 2022 09:02:54 +0000 Received: from PAXPR10MB4734.EURPRD10.PROD.OUTLOOK.COM ([fe80::116e:6242:98da:22ba]) by PAXPR10MB4734.EURPRD10.PROD.OUTLOOK.COM ([fe80::116e:6242:98da:22ba%8]) with mapi id 15.20.5038.014; Wed, 2 Mar 2022 09:02:54 +0000 From: Fabian Stelzer To: git@vger.kernel.org Cc: Todd Zullinger , Henning Schild , "brian m . carlson" , Hans Jerry Illikainen , Junio C Hamano Subject: [PATCH v3 2/3] t/lib-gpg: reload gpg components after updating trustlist Date: Wed, 2 Mar 2022 10:02:49 +0100 Message-Id: <20220302090250.590450-2-fs@gigacodes.de> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220224100628.612789-1-fs@gigacodes.de> References: <20220224100628.612789-1-fs@gigacodes.de> X-ClientProxiedBy: AS9PR06CA0064.eurprd06.prod.outlook.com (2603:10a6:20b:464::34) To PAXPR10MB4734.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:12e::15) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bf8ad8e1-d100-4c85-4fbc-08d9fc2b7017 X-MS-TrafficTypeDiagnostic: VI1PR10MB2015:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3K+LaGpc29xgGMEVF0lyCRzJA227xvCSZr8GtikTNlA3W7aUAlZGU0KflUweycRFfVemtSa0gQotghl5bcf903ZzFI5NlMTr8/hhSvl1Oc79cgYbns9kzWH2ybO4wuK3EjV7LSP0qZeHZHNpmuBDBn55JF05eKQqhfdzO2iROKFfM4a/d9KVTJs2LACbaAeM8jTH448MLmxaw7U3pQ5ICDF3FrkBJgHxfEIfKy34pVrdjQg1LC5iE9LpVYOkjuzZ84G65Iq9iYAOvjtYaiZjZoFG4mKGfzDQXbi+gkDcFJs0bJTvhiRX9E5gdx58OcE9UDsNRXVD9rsnzUi4azXTqd7sgKPeXZbGW8KPT9MbDoXVOvn1xZivzhWuDlUHDpENK5kSJ0g6ga0XWA9mPcbxMUghsjdt3RCgSLogMDw3u+l8lej3cH35kA9ZYV8V1zvSIJE3QobuewtoNq0W3jVzSkC38sbF0ywBXW/QEQl15rmkl3MFK90108VtbzjZCIwxwYBIfL+zIeRyrax1k7y6ANOMOKNiTDsgUpCx11g0AyWenfoGhNobrrj5RcWffzZeA2jKkjc2JoL8IcVJeHy0/7f2aKhLJY72cfJcdSCu72xS/SY4sm5ZFJd920MrgDMUh1daelYbDaAHnBd820Rf5g== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAXPR10MB4734.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230001)(4636009)(366004)(136003)(39840400004)(396003)(376002)(346002)(36756003)(38100700002)(186003)(8936002)(5660300002)(1076003)(2616005)(4326008)(6916009)(8676002)(316002)(66556008)(66476007)(26005)(66946007)(86362001)(6666004)(6512007)(6506007)(54906003)(508600001)(6486002)(2906002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: APst4oCAeCJ+/PlJL4w88wntdJ09RFm5+Cx5on++wHkeJVQa3tZPyOt6BWSZ5VHffqZ4i4tId6ddJ8NQyBSux32N7pToBpTe2UADGvceaYwhey9WgMRrito9UFTAQ5FtSq+23Nfvt2PbkrL3ERY7l/euEf+6fJ61iYDlUZoeCk2fZyu3qfdpEKFMlGD9TVdm/607Pd7+9aZMupcC9xXe6/WhmfgHNyOOw5TnRAZRcEi79mMc0p4oZmeopLoXdkLF2ZHxLxd8p2Vhqi7bD50Bk3m4sabe0XirWcB2YimVYU6tpsffKSCdhje4sztEnDc1BRhyouYRXcKBzpb0WtlwYJeRvkmEgsnuwjX0njeF2bx6GdJ3/wOyrrhG0dEwFV5rJWvwZQF+Uon5xN2a5+dwgXpY7RFYmRSDb1vseOx2GGIwpcYdXy8/yHQ17PXf6DGm2VSVZxPQS+c6vfhFF9OqEzCSJ+JxI7ZinNqZF1mwriy6sS1/jfFL7LEyYW54M8tiYwJMCf40cyv8O18PlMU2/Q88chpqfz+Cpy5daFtCV2J2sxm85ULqyH7xR4uOzMP39d3joswngHUc2qUqCz0YUvHTJcJx4akzY59Rum4zGYDFjI6nIaG7mHH60pADYpHHAMTIopDoRWRu+Vf1u166ESv4tZCaYWMrXD33IbOCwRAw+Jiuf94Eza8sAh1tmAo6Migw4p5sfSXyobwJmsiKx5/QqFsLU6a7Z1d9TKw0ERFRmEAgvWzRMqH2hXIRypR5wSUbD3bnw3HXgutPXSe4GTNLNi9oFC5IKqU29ECdhtyxKDAnFCRCCzdNczFnnwaQFXq0CNFIHLotj2hG/p9HAG5VvgaowOYNF2Fm04QryBmo9R8uFWVZddNYYEtPnnDDSQk1a7GjedotWbmEnlYqh4QmlMzazqUR8owqyz3CSP2nur9XT2491bABmxNyP4RqhhFxb4T5kCfV/YlikZjfM46yhpg13IZCV8zgzSYbsseZGJkeaiz2sTJnBfwOV3Nz6IkIcw/XUA4uyhtiS3johmaSzIMgyqU0rOMCMjIKq7A5lCJ+yiNURwvs6JcE3G00rmPwK34Gzzr5f7j1XHy8P5hgVwHpHlvPs6H0oDNaHUB5qtZ1JZ0JE3u09y8ltSL7XfyzQzuDON+KF1vwJCuoXBaHn9ZR2hxLT8bLfnyOgF0HnEjUt1kib6qFTS1PcdOvmRQwotu43qwWjA20gPylKRlfXJcQSC3UkWRxm5qkCnSUW/QZIqrax9LhoEYHUPCPM9vYrejmEJ2sUYd1pVDOKhsonumOi78OCxPzr+5S0hIk+s16RmwBnOMX+1tfaTttllaikgNb7nwmRhJ8qyYaWq49hBj/Ii3yDd09xNdCmm9CI93Vn+dUbC4DXLBtuNTRO98sJVn8rPcL8e+4het7ruLqMvITU/JvyeJWktPbXavmUnectmIHoR+m3NBTTP6nutuMO/6clsxOQm8eFAZyIcJD4GlbnqXjZ2kuPocgzkUYtzCi2CFsntrmwpE+9WFzHmOdpvHfu3JKP71LSkFXqyMI5Av4btkLzp8RMnquOlXQ3ov/6bbar/9EKPxplvWe76zAHqHB19fjzaLtuzyozqLj8xIvf92RsiOdHTSc0cOgIQZIgJk/EgvGbkroYOSNBQmzfj0fSdFCwNKl347MlW3q7MYtUM9Pr+wXwF7ONT4= X-OriginatorOrg: gigacodes.de X-MS-Exchange-CrossTenant-Network-Message-Id: bf8ad8e1-d100-4c85-4fbc-08d9fc2b7017 X-MS-Exchange-CrossTenant-AuthSource: PAXPR10MB4734.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Mar 2022 09:02:54.4786 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 80e41b3b-ea1f-4dbc-91eb-225a572951fb X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: pQn1UcKlIaJwFqDF37P28zwzRRh8moVLQAp4YOVd0iXkRV0P1f3XYSqCbU2kV9ItN0kd/46k/bxzKLZ0+41RliMI6CqMY+3UoVQt/L7qj4Y= X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR10MB2015 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Todd Zullinger With gpgsm from gnupg-2.3, the changes to the trustlist.txt do not appear to be picked up without refreshing the gpg-agent. Use the 'all' keyword to reload all of the gpg components. The scdaemon is started as a child of gpg-agent, for example. We used to have a --kill at this spot, but I removed it in 2e285e7803 (t/lib-gpg: drop redundant killing of gpg-agent, 2019-02-07). It seems like it might be necessary (again) for 2.3. Signed-off-by: Todd Zullinger --- t/lib-gpg.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh index 6bc083ca77..38e2c0f4fb 100644 --- a/t/lib-gpg.sh +++ b/t/lib-gpg.sh @@ -75,6 +75,7 @@ test_lazy_prereq GPGSM ' gpgsm --homedir "${GNUPGHOME}" -K --with-colons | awk -F ":" "/^fpr:/ {printf \"%s S relax\\n\", \$10}" \ >"${GNUPGHOME}/trustlist.txt" && + (gpgconf --reload all || : ) && echo hello | gpgsm --homedir "${GNUPGHOME}" >/dev/null \ -u committer@example.com -o /dev/null --sign - From patchwork Wed Mar 2 09:02:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabian Stelzer X-Patchwork-Id: 12765672 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 142DFC433F5 for ; Wed, 2 Mar 2022 09:03:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240355AbiCBJEC (ORCPT ); Wed, 2 Mar 2022 04:04:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41258 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240319AbiCBJDt (ORCPT ); Wed, 2 Mar 2022 04:03:49 -0500 Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-eopbgr50069.outbound.protection.outlook.com [40.107.5.69]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F26461C138 for ; Wed, 2 Mar 2022 01:03:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZisF6NQtIc2binSQ7DZv1Sb925EAJF6LQDGLTMuazbWq8c9sRL4HzgDVnjTi4PqyvWhrZmsK/RxZYW9O0+bFOd9QhCzONQa0bw8c/Qkwga/uE0Y4fXpI6WrIMpjHqXYpzLfQ56wtUEA64UJ5U1sm3ljotHm5OuDYcLIy8W7XxuLKdXKq/tXhXKAz3SYLdtvtLVh1icjMQKntFqy8C7SE/srIDJvjcyHDgNudClMgXTTHKCjvY8rrx1l0ZfUEb/AB5COnNZDTbmUic5Dm9VQ2n5qC8EFpR6UamFhco/mhqQ28A4cWxnSFfGphuRQXEpaeksScUuuT9yh8dxl+YwgDvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=oVSdiDXFIjMdIFa7p7N/jLr0vnjb76Jgq9wuTkoF8yI=; b=KvxP18Y9u8bgrPGzyh2N2zQspX4CzyOcBMFBRYzky5zN7Sfx+nsUCMGqzxd4zCQ2LFjLdwJpJXpo6Q426JGNfHaoY7J1Olp0ATs9H9r+KyH3uv6tzwb8kqZUO8fCxLS2Lx/cUAyAQfFvvyWk+Ey5ExjUiroWVR7wS8neqF8fYFAQbQR1YvKdd8oEuRj98lc/DXxPK8FioLLXdohywVTyjrwfSrydjJXlpu70mPQZ5sncgOckfmPmFH4pYF48cVe9crrLErV0lNMPXHC1KkPHlpJgOlpV8fQGDe2a7k+Pe01MH7rJ6l6Cc22DAYlxLoZB/B5HD7tyavj7OcjwiUMX2A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=gigacodes.de; dmarc=pass action=none header.from=gigacodes.de; dkim=pass header.d=gigacodes.de; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gigacodes.de; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=oVSdiDXFIjMdIFa7p7N/jLr0vnjb76Jgq9wuTkoF8yI=; b=M5SAF2DOVwF4wQVC5RJU8/2lI3dCtM4aGonrT5pDcG4MCcRB5dDf8RT9r/V6MONt/zGifVzx7i7UDwty0dFLJ9cjAABPpQ+Z/BjpvrfelXcx/Tr3y8/pV/hfTwhJ8MDz1dUIwHHAt5NsaP9IC/HIpU7+4CiW6n2elsCjOj3my/8= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=gigacodes.de; Received: from PAXPR10MB4734.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:12e::15) by VI1PR10MB2015.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:803:38::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5017.26; Wed, 2 Mar 2022 09:02:55 +0000 Received: from PAXPR10MB4734.EURPRD10.PROD.OUTLOOK.COM ([fe80::116e:6242:98da:22ba]) by PAXPR10MB4734.EURPRD10.PROD.OUTLOOK.COM ([fe80::116e:6242:98da:22ba%8]) with mapi id 15.20.5038.014; Wed, 2 Mar 2022 09:02:55 +0000 From: Fabian Stelzer To: git@vger.kernel.org Cc: Todd Zullinger , Henning Schild , "brian m . carlson" , Hans Jerry Illikainen , Junio C Hamano Subject: [PATCH v3 3/3] t/lib-gpg: kill all gpg components, not just gpg-agent Date: Wed, 2 Mar 2022 10:02:50 +0100 Message-Id: <20220302090250.590450-3-fs@gigacodes.de> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220224100628.612789-1-fs@gigacodes.de> References: <20220224100628.612789-1-fs@gigacodes.de> X-ClientProxiedBy: AM7PR03CA0021.eurprd03.prod.outlook.com (2603:10a6:20b:130::31) To PAXPR10MB4734.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:12e::15) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1ba8b1e2-bbde-4ef1-17da-08d9fc2b70ca X-MS-TrafficTypeDiagnostic: VI1PR10MB2015:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bn5D6e7YIRfNyhH+K16+HWG84JYyTUHa+RKov++OnUVvpu707RUB0+AXT4W3qGAZx6xQB0ne3Hdzs9BTZe1uPTzhwOJJrJjOxgmX/xNIMbb0DvhvwOHhud0I1GShQYDKBjIAD4/X7NJVxfL63xxTvMH3IPyGJBGEYNfkGsGlgIdYVSVF1dtDIwcWpbTbX6lSyI7rg6Pup6orPXVPjqwJA/nZmaYRF1BDgAdc6fJKsotdLDCG8GMqPlkcAOKXYnkK4VS+mW7UrRJ7PdEckWwG14lYt3WrrA0scmMAUCOTQlXPtYOx0XkPRoyQyVGY2ZdFDcCXVhl8Md61RuQiC0cL0i1z8A9WLy8QyEo22t1hkT+sApBUmt0e8PEhKf1RCxhS3Utx+dpjjPFCv8Kk5B9H5fARktYxPr4fkKD10kZqu7Ku5Uokq2kw6cb0XIKpgwQYHCjtPF6g9znu75Y+a6Xb3Wr6CVj3P7sEhUEz/fPlo+sIsIpKxM78+lGECJKFIIiABwgMAN81f99SpXOpbALS/hdRRAF2VwiIpfn6oN3qgKPG2hGLFcKoVFwGHbHfLEzcC/ktdBJvQqPKCoxyzA4e6017iVqfBVBx+zIz5C9rQxEkr4MxXCeF2B4Y4LhgpqhD7VimVxb7as0klV+s5sJWyQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAXPR10MB4734.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230001)(4636009)(366004)(136003)(39840400004)(396003)(376002)(346002)(36756003)(83380400001)(38100700002)(186003)(8936002)(5660300002)(1076003)(2616005)(4326008)(6916009)(8676002)(316002)(66556008)(66476007)(26005)(66946007)(86362001)(6666004)(6512007)(6506007)(54906003)(508600001)(6486002)(2906002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: xZbAEjWuj4aycjqL7tTU/mUHHeW1AD6t8/dPfZQZlUTt2XKiffL7ZJfiWVMhxqAR0mavEErMTL8MKVaBBwpzI6x6kpXGJBGwp7kUcZSLt2qxL2IGgXKyj6rcfiVdb7pUFFmPbtwpGJyvxvLckGH3yvMTZPS0J8ehqFCISbHWS4VP2oK6rgLqElm/RBbpPnnbYbImm+nxnuaCa3R0vtgUowxHhiMjHbXkYyskJguwryhjEPutPnSYhC7HE6dYZbOiVe5G5uCTpDDmjyad+DIRTmz0ySq8Uzh67XDBIKZxvRHa9ilCnhdbB+Z+7Gv4ljyCkKXIaO35SN2PAmVoDdNbR6VBkpVDHFVxRaDbHrLvTveP4vB9gxBb88SGa+rtX8HtWPptxjz3M0hGzdzwfg7CwVsOI5nsN28l0O5r53NIsvGi9HZ/ADiRk+lvBkTwtKguQQTvH5VNC9ErqR2juH92aoEW6Wq4Tj+oLajllWK3vGFX2UZDTRs34a2nzB0JbhjmdVhr11R+aeQx/reImFa2gKEUqQsOCXAjImw0ehWqkNDvot1eeGUfG01TO8W9LRtLd2VfJrURJ/kxqEIoYv5cGuZXbu1WJwSTvoB/mQcPNumoHwCcdWvVq8HuF1w6sUnUBZuKc5jeeRBTjXUVnCkXppbv+23j+9CprgDO0MxFFz//zzLr0uRAay12O2SKjD+o4dBSDQ7SJPS90QpLAwx56A4HojhVwTIyu0bJa8vxc2whDrrh1EnGiqKqJEzy4wk1jtxW7fP/Jtzrdd5AdBTdnVqdzm/ntZ+NAkApC6BTcmjb1gbIs9dfdd9r98osoTC5DxES4yRiUS1OLaL/RBpkM9gPU0oUzprtE0y3KrtnakReyUOZ33DD0F2Jv2x2vceA0z7PxLppCkVnDNiQMmsyFxagDq5W4CPQtGLKtdXxkwNkb0FsyYmf2My1oTSloW5ww8Nz0H2S7Ayyin8C3WFvxv5h4p56TSxyBE9MI7Skv36MkG9RxZxsq2aZYx14UCe/x70pAuDdzQZvODwRSg0eFIpEmlKgGwd9/miX92GYoeHpwBZodihqUUOBC2zRn/xXjnqSnfVnRkVFFvcycgzH9PfsSB5u0xH8Dd3aWpzzDvfJf4HacdCMLJWeCW1Hj655JqRneQEKwLIxDcrWnR4Ym/K3Cc/uAR+S/hLADajFBtXrW9hM6r6MQdq8Lcp1IREJpFQQQHV/s8ieEe+nJ46d3kEJipj/tj/y5Oae+fqzmgyvIxttc5AaspOdj2n6YbcYTCpLKAVWrvXcX7wN8bVWQSwqTJH6dk3uaRl2CLdK+Jg6itbMd4Ruqj+Gh5aJqv2QSalUU5vwXpLCrz0TzuQTfdT219/pGt7afDZma4ecpMuPDb61tRgT/UGH8WcJ9UaHTIgnlMA6QH2JQWZXFTNi/9cZkjWoQaySGpyrdQGLdn/Q55KSgi/r/zbo3d6hW3mM6nPp3cOZxeUx7Fm01e8vrE8YtlD9u0+Dg7VsFbyGv8N/PS8s5dlASyW2pM2N/Cfc9pvNJhC4xr5nA48NWPeb/ZrmewQefbl4zgDorHrHxNAqdQs1RaHbX0lGNkBJ0t/9GZMQP0BpXSmUM4dC6G8OOMHCLfM4rUvMR3wp1Q9qquqxP0kfrqmPUO42jsPW90RXjbSe4NLdjFcEEl+al6B21QMebIvI+K5YT4zlswd7sYo= X-OriginatorOrg: gigacodes.de X-MS-Exchange-CrossTenant-Network-Message-Id: 1ba8b1e2-bbde-4ef1-17da-08d9fc2b70ca X-MS-Exchange-CrossTenant-AuthSource: PAXPR10MB4734.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Mar 2022 09:02:55.6638 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 80e41b3b-ea1f-4dbc-91eb-225a572951fb X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 80o5u60ggPYG2VblmvfhtZQ+5PBKPyIbP4C4kcUJ8Ukrf399j14jrg1udhn8huupatWXKb0LRbUTlMns+J/KfSEm0TPPTGPlvgkIwMlBQ0Q= X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR10MB2015 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Todd Zullinger The gpg-agent is one of several processes that newer releases of GnuPG start automatically. Issue a kill to each of them to ensure they do not affect separate tests. (Yes, the separate GNUPGHOME should do that already. If we find that is case, we could drop the --kill entirely.) In terms of compatibility, the 'all' keyword was added to the --kill & --reload options in GnuPG 2.1.18. Debian and RHEL are often used as indicators of how a change might affect older systems we often try to support. - Debian Strech (old old stable), which has limited security support until June 2022, has GnuPG 2.1.18 (or 2.2.x in backports). - CentOS/RHEL 7, which is supported until June 2024, has GnuPG 2.0.22, which lacks the --kill option, so the change won't have any impact. Signed-off-by: Todd Zullinger --- t/lib-gpg.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh index 38e2c0f4fb..114785586a 100644 --- a/t/lib-gpg.sh +++ b/t/lib-gpg.sh @@ -40,7 +40,7 @@ test_lazy_prereq GPG ' # > lib-gpg/ownertrust mkdir "$GNUPGHOME" && chmod 0700 "$GNUPGHOME" && - (gpgconf --kill gpg-agent || : ) && + (gpgconf --kill all || : ) && gpg --homedir "${GNUPGHOME}" --import \ "$TEST_DIRECTORY"/lib-gpg/keyring.gpg && gpg --homedir "${GNUPGHOME}" --import-ownertrust \