From nobody Fri Jul 07 17:52:48 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QyLbL5nd3z4l4CW; Fri, 7 Jul 2023 17:53:02 +0000 (UTC) (envelope-from kp@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QyLbL5NXXz3BmY; Fri, 7 Jul 2023 17:53:02 +0000 (UTC) (envelope-from kp@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688752382; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2waaWwZcI6o9hr8rw1zusH9+HGYIR2bmqbo4a0oPs+g=; b=KRIb2+uOFv2J/AnNOiOMnF/z7C2ORbxpvEWoAF/0R24cqehaDRH+YI1/pCuisKWEyeHNOU k85yj7oBz3sLFwqIPXZygQVrdlMY7RBlNF5ET14LcRAb7RwpAtFjndhy9ipoPwty20hCPO C/2SsmArTTlyjzyF++A73LLYrkR76Jc8J90z0c5yBAUSU6hyrQuPkUzcjFSV8aTsGlc8iQ xZpJUlIhhHrGWf2UeQzsxGVmZu3//8PIIEvxLsJtUgDp/7pYJcC28onq67/hWEMOxq0HJN hsFHvpJ4QWEwqg+0tvuVjzWQ3OcQ4qgf4bn9zRwCrMP8LyNeyQZJkJqKIJTObQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688752382; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2waaWwZcI6o9hr8rw1zusH9+HGYIR2bmqbo4a0oPs+g=; b=NQWnBSpy+sd0v6poFLagyKrsfedUshGv/JEbxzPvjEyhoVpTCtDX/b9h51g6H3TjGUuGg+ PElGLmAKXBZ/geRrgoRJU9ShkVptMAMJ3ccXqy60vvOxgv0a/XeOKS25jO8CgG4p34vGhq FRqqor3IPlx8y0Vt0b2oLVwzCZEU1lbqCwyol1M33PcoCiDUQkQvQAFm8AKrdNxYaw2E3i YCupqD/MQh3B2ke2FAfv+nB8rwrpwjZYboNAB5TP4e8M1xbEo7g8BdiPQwlfdooGK+84vL ltb+akCjFOHQhn43aFp46dXoDmh47bVSRMbNsknqhmdoYRsD80NjK8ThTDPw/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688752382; a=rsa-sha256; cv=none; b=j9q5LRxHvdga0KXK/Zof8NTMWVJua29ImYHJc3NKIeBnYguYECkPoNoiLcq4t1BD4XsEbH qVSVbkHnhMiMySGGFgB2H/IOvDltovjuGqSogmtEAoF6PdLM1GdMM6FhZt8xl9C233epsq 0DUrSKuAWpPXs1V7ZcKAiWg3E61V7OC1hgNx99CRTj42OXXBGhwkOO2Rwoukv1vJlF4RLG uTGinrc5tTy08Z01u7x2kpfo2LTuGqP5NNfALrKGoyBDSPNTp8vJTHv9NJ4uEqol8HA7CL Mcu2KQbi372w6AEPnmxcL2QXbAhRdBifRGIzwyJ4TwGRRU8dO7qsqyIluOgwgA== Received: from venus.codepro.be (venus.codepro.be [5.9.86.228]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mx1.codepro.be", Issuer "R3" (verified OK)) (Authenticated sender: kp) by smtp.freebsd.org (Postfix) with ESMTPSA id 4QyLbL3rh8znL7; Fri, 7 Jul 2023 17:53:02 +0000 (UTC) (envelope-from kp@freebsd.org) Received: by venus.codepro.be (Postfix, authenticated sender kp) id 2A280316B4; Fri, 7 Jul 2023 19:53:00 +0200 (CEST) Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable From: Kristof Provost List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 (1.0) Subject: Re: git: b077aed33b7b - main - Merge OpenSSL 3.0.9 Date: Fri, 7 Jul 2023 19:52:48 +0200 Message-Id: <6EF29DA8-B987-4C98-826C-0128C43764C6@freebsd.org> References: Cc: Ed Maste , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, Pierre Pronchery In-Reply-To: To: Mark Johnston X-Mailer: iPhone Mail (21A5277h) X-ThisMailContainsUnwantedMimeParts: N > On 7 Jul 2023, at 18:35, Mark Johnston wrote: >=20 > =EF=BB=BFOn Wed, Jul 05, 2023 at 11:56:42PM +0200, Kristof Provost wrote: >>> On 24 Jun 2023, at 1:19, Ed Maste wrote: >>> The branch main has been updated by emaste: >>>=20 >>> URL: https://cgit.FreeBSD.org/src/commit/?id=3Db077aed33b7b6aefca7b17ddb= 250cf521f938613 >>>=20 >>> commit b077aed33b7b6aefca7b17ddb250cf521f938613 >>> Merge: b08ee10c0646 b84c4564effd >>> Author: Pierre Pronchery >>> AuthorDate: 2023-06-23 22:53:35 +0000 >>> Commit: Ed Maste >>> CommitDate: 2023-06-23 22:53:36 +0000 >>>=20 >>> Merge OpenSSL 3.0.9 >>>=20 >>=20 >> It looks like we missed adding a file. >> Security/opensc doesn=E2=80=99t build any more: >> https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D270076 >>=20 >> It fails to find d2i_KeyParams when linking. The opensc code does this: >>=20 >> #if OPENSSL_VERSION_NUMBER < 0x30000000L >> if (!d2i_ECParameters(&ec, &a, (long)l= en)) >> util_fatal("cannot parse >> EC_PARAMS"); >> EVP_PKEY_assign_EC_KEY(pkey, ec); >> #else >> if (!d2i_KeyParams(EVP_PKEY_EC, &pkey,= &a, >> len)) >> util_fatal("cannot parse >> EC_PARAMS"); >> #endif >>=20 >> d2i_KeyParams() appears to be new on openssl 3. It=E2=80=99s defined in d= 2i_param.c, >> which we don=E2=80=99t build. I=E2=80=99ve tested with this patch, and th= at appears to fix >> things: >=20 > Hi Kristof, >=20 > Would you mind posting the patch on phabricator? I can take a closer > look in the next day, and Pierre might be available to look as well. Sure, but I might not be able to do that until Sunday afternoon.=20 >=20 >> diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Make= file >> index 28258e796984..ef5652e8c27c 100644 >> --- a/secure/lib/libcrypto/Makefile >> +++ b/secure/lib/libcrypto/Makefile >> @@ -74,7 +74,7 @@ SRCS+=3D n_pkey.c nsseq.c p5_pbe.c p5_pbev2.c= >> p5_scrypt.c p8_pkey.c >> SRCS+=3D t_bitst.c t_pkey.c t_spki.c tasn_dec.c tasn_enc.c tasn_fre.c= >> SRCS+=3D tasn_new.c tasn_prn.c tasn_scn.c tasn_typ.c tasn_utl.c x_alg= or.c >> SRCS+=3D x_bignum.c x_info.c x_int64.c x_long.c x_pkey.c x_sig.c x_sp= ki.c >> -SRCS+=3D x_val.c >> +SRCS+=3D x_val.c d2i_param.c >>=20 >> # async >> SRCS+=3D async.c async_err.c async_posix.c async_wait.c >> diff --git a/secure/lib/libcrypto/Version.map >> b/secure/lib/libcrypto/Version.map >> index 421819324961..74d0b8b3cef1 100644 >> --- a/secure/lib/libcrypto/Version.map >> +++ b/secure/lib/libcrypto/Version.map >> @@ -3564,6 +3564,8 @@ OPENSSL_1_1_0 { >> d2i_IPAddressOrRange; >> d2i_IPAddressRange; >> d2i_ISSUING_DIST_POINT; >> + d2i_KeyParams; >> + d2i_KeyParams_bio; >=20 > Based on your analysis I think this should go into the OPENSSL_3_0_9 > namespace? >=20 I have no idea. I=E2=80=99ll try to dig a bit, but we=E2=80=99re pretty far o= utside my comfort zone here.=20 Best regards, Kristof >=20 >=20