From nobody Sun Jul 09 16:18:09 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 4QzXNy0QDdz4m3WM; Sun, 9 Jul 2023 16:18:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QzXNx5S4rz3HYj; Sun, 9 Jul 2023 16:18:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688919489; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ijp7tWMIkHWV96pu57P4DqzWKr84c393k7wJrRZWweE=; b=xaz7mCH+IY6g4sxAVKbJiY8Ogw6qLElxkjnoA81lkQ4c5xJZ8a0CwHepcjyqoT8oeFgiEY i1+b5lhW4aVgww8EDaVjWTncpWo6ddhQJSeYcQtSyXjhYSCBjTJziimxurpVEmCYxuWnGe yOQ5Zl2/k3uIlfNVOLtZcV1NDMDnFA9wtSQ2hcdURWGB795GF+mVthgVUliLrbEKzMw2gI EptQLXknQXyI3Wx72CVdynBQmpVQB9llSSmte78NR2qrjYv+DAu7NnJt6ENz5t+KLiWS0+ s5E90is9xJrD2/EnlNZKiOO8PdQ1OTV11HPZT9Fb8Cb5fqh14G59KBfXpqNw9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688919489; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ijp7tWMIkHWV96pu57P4DqzWKr84c393k7wJrRZWweE=; b=oa/N58DTCnUB5fax4mvp+wA0plN0XMqISbCeduAg5/vqghqCyHXQ4opyt5RfJQB9QnxeIs ADFcucjYULot8Sx6fb37o/0aB9QaskH0f5V0Zkbf9YFy2OvqtftH7ICWKz0YGUBaSJUPhJ f9mgcnsQay5Oamlax3FFNnwuExCRvJgVauKfviqb+Qt1Rrar8B+4FktMw7G8Hkr1HrhKwi jn7L4sF4vznBlUtPPYbKrpByAPXz59oxGcPkanmlxgdKE/k/S07N4EqiGRM8uVLtxNGWgL Ca6T3TODypPBUDue4R61MUrCZqw0N2bF1V897k0bVQUAFDdViR3sK6vhTF8lkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688919489; a=rsa-sha256; cv=none; b=kNDtB+VVFIEJRfb9huUcS/MmA6SGICyofSRU0zQ0VBzqiqxr1vEejUpj2fFofi5cObrOqF 2+dmJqF9NnJPSy0sfhRDplWdp8enRkyTnJgo4XDwaXF68WtdENfnyFKXsuS+8+Zm8NA0lN OvJU8fMRaErQvfSIsv+4L/8UCB6FcoNMYFKKMD5WxDSq8SMYCGKkjkQTTowxSea+kJWodJ Mm6zAtWFgsp08Bb7eRVKpu6INjJk81h9YD0/91pKgRsmU8IBD/NwIHdMeSOK9Bp2R4PDT/ 3APBJYAkNXZMvyzET7nbDA4lQ+kotXgNkM7lTW/EUFn4Wk4y0vqcP+WuXna93Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QzXNx3vysz180C; Sun, 9 Jul 2023 16:18:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 369GI9qs036947; Sun, 9 Jul 2023 16:18:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 369GI9O5036946; Sun, 9 Jul 2023 16:18:09 GMT (envelope-from git) Date: Sun, 9 Jul 2023 16:18:09 GMT Message-Id: <202307091618.369GI9O5036946@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: ebd508a0b271 - main - openssl: include d2i_KeyParams() and d2i_KeyParams_bio() 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=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ebd508a0b2719e15575e8a2224f0730c4d37afec Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=ebd508a0b2719e15575e8a2224f0730c4d37afec 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_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;