From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 17 Apr 2023 10:55:16 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1poKdn-0066vx-Sh for lore@lore.pengutronix.de; Mon, 17 Apr 2023 10:55:16 +0200 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1poKdo-0004ab-8W; Mon, 17 Apr 2023 10:55:16 +0200 Received: from smtp28.bhosted.nl ([2a02:9e0:8000::40]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1poKdO-0004aQ-BC for ptxdist@pengutronix.de; Mon, 17 Apr 2023 10:54:50 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonic.nl; s=202111; h=content-transfer-encoding:content-type:in-reply-to:from:references:to:subject: mime-version:date:message-id:from; bh=VJNWoQN/rWnZlFvexsL6CfhQ4lLphkMJm81LLi+n8pQ=; b=Kr+5MpRwwlc3BT6JoHSYwS6qiJOEVHaKwCOehrkeuGhpTyKynCLoyqEKP0mI6wCNNs61FmzTePqzL HQP9rU1lg1OUZVRiD3rewf1IWLub5UPJpOT/jDhVKKj28EIEsyshLzSm0g+H/He8WxM/C5PKihrboG DeZyrGARzXQRu64uiLsIVwQan42DZKwaRFacoMUinJsisv3qr/vEPYCuiXpwfjzIvdVmcsEGelLOm+ XCJkrr/H/q2iV7cTHYolFAwTYoh+56IuvMCSyESMBnmFi1APsnzknRnEhHFOr7UKJLvX3bMcz0P4m8 dPq2r/E0B3kyYaJq0nivPLjpv1x7cbQ== X-MSG-ID: 823eca5d-dcfd-11ed-a150-0050569d11ae Message-ID: Date: Mon, 17 Apr 2023 10:54:48 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.10.0 To: ptxdist@pengutronix.de References: <20230406145016.3074015-1-robin@protonic.nl> <20230413135748.GW17392@pengutronix.de> Content-Language: nl, en-US From: Robin van der Gracht In-Reply-To: <20230413135748.GW17392@pengutronix.de> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-3.7 required=4.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,SPF_HELO_PASS, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Subject: Re: [ptxdist] [PATCH 1/3] rules: opensc: Version bumb to 0.23.0 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false On 13-04-2023 15:57, Michael Olbrich wrote: > On Thu, Apr 13, 2023 at 09:25:54AM +0200, Robin van der Gracht wrote: ... >> +From 9294183e07ff4944e3f5e590f343f5727636767e Mon Sep 17 00:00:00 2001 >> +From: Jakub Jelen >> +Date: Thu, 1 Dec 2022 20:08:53 +0100 >> +Subject: [PATCH] pkcs11-tool: Fix private key import >> + >> +--- >> + src/tools/pkcs11-tool.c | 4 ++-- >> + 1 file changed, 2 insertions(+), 2 deletions(-) >> + >> +diff --git a/src/tools/pkcs11-tool.c b/src/tools/pkcs11-tool.c >> +index aae205fe..cfee8526 100644 >> +--- a/src/tools/pkcs11-tool.c >> ++++ b/src/tools/pkcs11-tool.c >> +@@ -3669,13 +3669,13 @@ parse_rsa_pkey(EVP_PKEY *pkey, int private, struct rsakey_info *rsa) >> + RSA_get0_factors(r, &r_p, &r_q); >> + RSA_get0_crt_params(r, &r_dmp1, &r_dmq1, &r_iqmp); >> + #else >> +- if (EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_FACTOR1, &r_d) != 1 || >> ++ if (EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_D, &r_d) != 1 || >> + EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_FACTOR1, &r_p) != 1 || >> + EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_FACTOR2, &r_q) != 1 || >> + EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_EXPONENT1, &r_dmp1) != 1 || >> + EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_EXPONENT2, &r_dmq1) != 1 || >> +- EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_EXPONENT3, &r_iqmp) != 1) { >> + util_fatal("OpenSSL error during RSA private key parsing"); >> ++ EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_COEFFICIENT1, &r_iqmp) != 1) { > > This is broken. Probably a bad conflict resolution. The next upstream > commit fixes this. So far it looks promising. I'll do some more testing and > clean it up. I only compile tested the patch. Ok, thanks! Kind regards, Robin