From nobody Fri Jul 07 19:43:55 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 4QyP3L4kzkz4lbBJ; Fri, 7 Jul 2023 19:43:58 +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 4QyP3L40Ysz3tjY; Fri, 7 Jul 2023 19:43:58 +0000 (UTC) (envelope-from kp@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688759038; 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=JhBtYtZZIm/CLH8/vfgEHQmSxC3+2EnzS31yraVbOzI=; b=jDfTRVIEV5GCCBkuBmGCYQyz0NZxrVvFoGv1OzFZXIXGoP9JUl2IDWQtHZdO6gcy6PnB2/ 4+4nJ1ktrLBR4o0zVxKX3NwBdOAjg85xZP5zFQOWKsDltqfklJrTDrg+PPTWOX9/L176Wl S5ENx5Kq3NEQa/sKud7Ido/ds4YITSRb/1o4qHToyMCEtVkFtF+L5cWCoymOChnVzH3XaS ggukfvj/JKpYm6FW9XNeg4tns9+r4pj1jXWvYKzOWYql3bSYyYHnQ1vJcuDyTlVjr4JJTS 9axdT6c885MvtqzkgXzIigOsqmOqUg0VFIhlKGjO7jqIgcYjGlzue99KsmeGyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688759038; 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=JhBtYtZZIm/CLH8/vfgEHQmSxC3+2EnzS31yraVbOzI=; b=C4e3Y0eLdW9suu51j9+V/XD2v0eBCF934E0e0mvNgeLaNCoRJ9PW4wJy+qCguNBAeSr5Ru LT1xu2Yl4RIwM1x1IHNLgLv216FNxFHcNjZLhs+D6VRfYWgk46Fni34VXeqAvDv/xe35uh 73de9FTWIqKY+/fYb9nPHus6QTlnF5psEQJFXcToLqCeKYR4AaE7tOzFRrBJNUI04m1Ml1 Bx8Ha8g4KDBFyWzGkMtjve41mzPnPGkhqJMv784v+baDJQlechIO+uKBG4EbyC17h+1zac pyDfAYMps5JUAheijnfC0weuMbzCT51wnFzLBILnHLpRajegnt9UX2cct9XksA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688759038; a=rsa-sha256; cv=none; b=cZ0r8u8WKbfqhsSQVHgu78e3vU3Kj86lLv9friWKa0xvXa65kkcP6HCUO9DrM9tGBficWB /ar4uxJW+N9q84udOAxmAr42eTcOjEJrh1HqC1ZWtZXe1ji1UDd/+EowTPoAJbYM+f1lbk YnIXf8hjZK1s2aY0nn/6qZrMmX04kNJsLmYYNfWJZy0RqynB2SDBYkRggDs7Kpme6wumlE 8jkjFGaMUsYtIV3V+QhDCMTRc+NL1sX37szF/yN/Kcn0IHnMWnFVLuiT7QtncFE/HxBhGY jUzbxVcJQlQ0sMWUAaO2dblg/zEejtsftD+I3j4Wa81GMMLJNSJ6r8ieYYWu1A== 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 4QyP3L2LSszmw4; Fri, 7 Jul 2023 19:43:58 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: by venus.codepro.be (Postfix, authenticated sender kp) id AAB8131A85; Fri, 7 Jul 2023 21:43:56 +0200 (CEST) From: Kristof Provost To: Mark Johnston Cc: Ed Maste , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, Pierre Pronchery Subject: Re: git: b077aed33b7b - main - Merge OpenSSL 3.0.9 Date: Fri, 07 Jul 2023 21:43:55 +0200 X-Mailer: MailMate (1.14r5937) Message-ID: In-Reply-To: <6EF29DA8-B987-4C98-826C-0128C43764C6@freebsd.org> References: <6EF29DA8-B987-4C98-826C-0128C43764C6@freebsd.org> 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-ThisMailContainsUnwantedMimeParts: N On 7 Jul 2023, at 19:52, Kristof Provost wrote: >> On 7 Jul 2023, at 18:35, Mark Johnston wrote: >> >> =EF=BB=BFOn Wed, Jul 05, 2023 at 11:56:42PM +0200, Kristof Provost wro= te: >>>> On 24 Jun 2023, at 1:19, Ed Maste wrote: >>>> The branch main has been updated by emaste: >>>> >>>> URL: https://cgit.FreeBSD.org/src/commit/?id=3Db077aed33b7b6aefca7b1= 7ddb250cf521f938613 >>>> >>>> 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 >>>> >>>> Merge OpenSSL 3.0.9 >>>> >>> >>> 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 >>> >>> It fails to find d2i_KeyParams when linking. The opensc code does thi= s: >>> >>> #if OPENSSL_VERSION_NUMBER < 0x30000000L >>> if (!d2i_ECParameters(&ec, &a, (lo= ng)len)) >>> util_fatal("cannot parse >>> EC_PARAMS"); >>> EVP_PKEY_assign_EC_KEY(pkey, ec); >>> #else >>> if (!d2i_KeyParams(EVP_PKEY_EC, &p= key, &a, >>> len)) >>> util_fatal("cannot parse >>> EC_PARAMS"); >>> #endif >>> >>> d2i_KeyParams() appears to be new on openssl 3. It=E2=80=99s defined = in d2i_param.c, >>> which we don=E2=80=99t build. I=E2=80=99ve tested with this patch, an= d that appears to fix >>> things: >> >> Hi Kristof, >> >> 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. > https://reviews.freebsd.org/D40914 >>> Based on your analysis I think this should go into the OPENSSL_3_0_9 >> namespace? >> > I have no idea. I=E2=80=99ll try to dig a bit, but we=E2=80=99re pretty= far outside my comfort zone here. > Ah, I see what you meant. That should be fixed in the version in the revi= ew. Best regards, Kristof