Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 9 Jul 2023 16:18:09 GMT
From:      Kristof Provost <kp@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: ebd508a0b271 - main - openssl: include d2i_KeyParams() and d2i_KeyParams_bio()
Message-ID:  <202307091618.369GI9O5036946@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by kp:

URL: https://cgit.FreeBSD.org/src/commit/?id=ebd508a0b2719e15575e8a2224f0730c4d37afec

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 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_asn1.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_string.c
+SRCS+=	i2d_evp.c n_pkey.c nsseq.c p5_pbe.c p5_pbev2.c p5_scrypt.c p8_pkey.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;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202307091618.369GI9O5036946>