Date: Sun, 09 Jul 2023 22:11:18 -0700 From: Cy Schubert <Cy.Schubert@cschubert.com> To: Cy Schubert <Cy.Schubert@cschubert.com> Cc: Kristof Provost <kp@FreeBSD.org>, 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() Message-ID: <20230710051118.A6B40448@slippy.cwsent.com> In-Reply-To: <20230710050510.B5B503BC@slippy.cwsent.com> References: <202307091618.369GI9O5036946@gitrepo.freebsd.org> <20230710050510.B5B503BC@slippy.cwsent.com>
next in thread | previous in thread | raw e-mail | index | archive | help
In message <20230710050510.B5B503BC@slippy.cwsent.com>, Cy Schubert writes: > 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=ebd508a0b2719e15575e8a2224f073 > 0c > > 4d37afec > > > > commit ebd508a0b2719e15575e8a2224f0730c4d37afec > > Author: Kristof Provost <kp@FreeBSD.org> > > AuthorDate: 2023-07-07 19:25:34 +0000 > > Commit: Kristof Provost <kp@FreeBSD.org> > > 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 the > m > > 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/Versio > n. > > 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 <Cy.Schubert@cschubert.com> > FreeBSD UNIX: <cy@FreeBSD.org> Web: https://FreeBSD.org > NTP: <cy@nwtime.org> Web: https://nwtime.org > > e^(i*pi)+1=0 > > Never mind. I have a patch in my tree that addresses this same problem resulting in the above error. Sorry for the SPAM. -- Cheers, Cy Schubert <Cy.Schubert@cschubert.com> FreeBSD UNIX: <cy@FreeBSD.org> Web: https://FreeBSD.org NTP: <cy@nwtime.org> Web: https://nwtime.org e^(i*pi)+1=0
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20230710051118.A6B40448>