From nobody Mon Jul 10 05:05:10 2023 X-Original-To: dev-commits-src-all@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 4QzsQ245qHzZWGp; Mon, 10 Jul 2023 05:05:14 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta001.cacentral1.a.cloudfilter.net (omta001.cacentral1.a.cloudfilter.net [3.97.99.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QzsQ225Wmz3Q5N; Mon, 10 Jul 2023 05:05:14 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4003a.ext.cloudfilter.net ([10.228.9.183]) by cmsmtp with ESMTP id ISutqVWF9LAoIIj5Fq9wW0; Mon, 10 Jul 2023 05:05:13 +0000 Received: from spqr.komquats.com ([70.66.152.170]) by cmsmtp with ESMTPA id Ij5DqrKfjcyvuIj5EqDJHk; Mon, 10 Jul 2023 05:05:13 +0000 X-Authority-Analysis: v=2.4 cv=VbHkgXl9 c=1 sm=1 tr=0 ts=64ab9189 a=y8EK/9tc/U6QY+pUhnbtgQ==:117 a=y8EK/9tc/U6QY+pUhnbtgQ==:17 a=kj9zAlcOel0A:10 a=ws7JD89P4LkA:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=eHKdCDTTfJ6lRacp5KoA:9 a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id D7E1935ED; Sun, 9 Jul 2023 22:05:10 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id B5B503BC; Sun, 9 Jul 2023 22:05:10 -0700 (PDT) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Kristof Provost cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: ebd508a0b271 - main - openssl: include d2i_KeyParams() and d2i_KeyParams_bio() In-reply-to: <202307091618.369GI9O5036946@gitrepo.freebsd.org> References: <202307091618.369GI9O5036946@gitrepo.freebsd.org> Comments: In-reply-to Kristof Provost message dated "Sun, 09 Jul 2023 16:18:09 +0000." List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Sun, 09 Jul 2023 22:05:10 -0700 Message-Id: <20230710050510.B5B503BC@slippy.cwsent.com> X-CMAE-Envelope: MS4xfN3fPKg/M5hO/edYBBBAdSpaIJ3d+Zv7tfIQpL+7FdeDCyOyAWuJGNqv5aCMHoxPNouL0mqk5KV2ARhVAtDRJ211yuQ3052+A0gPSYFUTcCWHhWCx4FA LrXPkiCAXxPepg/YvHej5KYBJYIyJ0dsUxQV9QstC2bgq/AwC8YRIboAQ77jO4jdsaHC9z/APCu5cK0A3OA2JA9zmrz8fRxZPg/fB0KFY6+0/yABWI3R8yDO xClMmhdSi7Q7V2/kIU75kFS9/auB3Z6vp9ciM/OPRE6anCY+74zg6ZlWqYYcfVptdEBrwRVkxCq8OMeU7a0NNYrZRpjrDURbxfMuTKJoYpc= X-Rspamd-Queue-Id: 4QzsQ225Wmz3Q5N X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N In message <202307091618.369GI9O5036946@gitrepo.freebsd.org>, Kristof Provost w rites: > The branch main has been updated by kp: > > URL: https://cgit.FreeBSD.org/src/commit/?id=ebd508a0b2719e15575e8a2224f0730c > 4d37afec > > commit ebd508a0b2719e15575e8a2224f0730c4d37afec > Author: Kristof Provost > AuthorDate: 2023-07-07 19:25:34 +0000 > Commit: Kristof Provost > CommitDate: 2023-07-09 13:18:21 +0000 > > openssl: include d2i_KeyParams() and d2i_KeyParams_bio() > > These functions are new, and some ports (e.g.opensc) expect to have them > available. Add the file they're defined in to the build, and add them > to Version.map. > > PR: 270076 > Reviewed by: markj, emaste, pierre > Fixes: b077aed33b7b ("Merge OpenSSL 3.0.9") > Sponsored by: Rubicon Communications, LLC ("Netgate") > Differential Revision: https://reviews.freebsd.org/D40914 > --- > secure/lib/libcrypto/Makefile | 4 ++-- > secure/lib/libcrypto/Version.map | 2 ++ > 2 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile > index 4421ea0b0855..89f330ca2800 100644 > --- a/secure/lib/libcrypto/Makefile > +++ b/secure/lib/libcrypto/Makefile > @@ -69,8 +69,8 @@ SRCS+= a_int.c a_mbstr.c a_object.c a_octet.c a_print. > c a_sign.c a_strex.c > SRCS+= a_strnid.c a_time.c a_type.c a_utctm.c a_utf8.c a_verify.c > SRCS+= ameth_lib.c asn1_err.c asn1_gen.c asn1_item_list.c asn1_lib.c > SRCS+= asn1_parse.c asn_mime.c asn_moid.c asn_mstbl.c asn_pack.c bio_a > sn1.c > -SRCS+= bio_ndef.c d2i_pr.c d2i_pu.c evp_asn1.c f_int.c f_string.c i2d_ > evp.c > -SRCS+= n_pkey.c nsseq.c p5_pbe.c p5_pbev2.c p5_scrypt.c p8_pkey.c > +SRCS+= bio_ndef.c d2i_param.c d2i_pr.c d2i_pu.c evp_asn1.c f_int.c f_s > tring.c > +SRCS+= i2d_evp.c n_pkey.c nsseq.c p5_pbe.c p5_pbev2.c p5_scrypt.c p8_p > key.c > SRCS+= t_bitst.c t_pkey.c t_spki.c tasn_dec.c tasn_enc.c tasn_fre.c > SRCS+= tasn_new.c tasn_prn.c tasn_scn.c tasn_typ.c tasn_utl.c x_algor. > c > SRCS+= x_bignum.c x_info.c x_int64.c x_long.c x_pkey.c x_sig.c x_spki. > c > diff --git a/secure/lib/libcrypto/Version.map b/secure/lib/libcrypto/Version. > map > index 421819324961..93dbdcb7f1cb 100644 > --- a/secure/lib/libcrypto/Version.map > +++ b/secure/lib/libcrypto/Version.map > @@ -5490,6 +5490,8 @@ OPENSSL_3_0_9 { > b2i_PVK_bio_ex; > d2i_AutoPrivateKey_ex; > d2i_ISSUER_SIGN_TOOL; > + d2i_KeyParams; > + d2i_KeyParams_bio; > d2i_OSSL_CMP_MSG; > d2i_OSSL_CMP_MSG_bio; > d2i_OSSL_CMP_PKIHEADER; > This patch results in the following error: .pico x509_vfy.pico x509_vpm.pico x509cset.pico x509name.pico x509rset.pico x509spki.pico x509type.pico x_all.pico x_attrib.pico x_crl.pico x_exten.pico x_name.pico x_pubkey.pico x_req.pico x_x509.pico x_x509a.pico -lpthread ld: error: duplicate symbol: d2i_KeyParams >>> defined at d2i_param.c:20 (/opt/src/git-src/crypto/openssl/crypto/asn1/d 2i_param.c:20) >>> d2i_param.pico:(d2i_KeyParams) >>> defined at d2i_param.c:20 (/opt/src/git-src/crypto/openssl/crypto/asn1/d 2i_param.c:20) >>> d2i_param.pico:(.text+0x0) ld: error: duplicate symbol: d2i_KeyParams_bio >>> defined at d2i_param.c:50 (/opt/src/git-src/crypto/openssl/crypto/asn1/d 2i_param.c:50) >>> d2i_param.pico:(d2i_KeyParams_bio) >>> defined at d2i_param.c:50 (/opt/src/git-src/crypto/openssl/crypto/asn1/d 2i_param.c:50) >>> d2i_param.pico:(.text+0xE0) cc: error: linker command failed with exit code 1 (use -v to see invocation) *** [libcrypto.so.30.full] Error code 1 make[4]: stopped in /opt/src/git-src/secure/lib/libcrypto --- all_subdir_secure/lib/libcrypto/engines --- --- all_subdir_secure/lib/libcrypto/engines/loader_attic --- make[5]: stopped in /opt/src/git-src/secure/lib/libcrypto/engines *** [all_subdir_secure/lib/libcrypto/engines] Error code 2 make[4]: stopped in /opt/src/git-src/secure/lib/libcrypto 2 errors make[4]: stopped in /opt/src/git-src/secure/lib/libcrypto -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0