From: tb <tb@openbsd.org>
Date: Mon, 15 Apr 2024 15:44:15 +0000 (+0000)
Subject: EC_PRIVATEKEY becomes internal-only, too
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=ab8894dfcfdd335d27a42d7bc3146ab14322dcb7;p=openbsd

EC_PRIVATEKEY becomes internal-only, too

ok jsing
---

diff --git a/lib/libcrypto/Symbols.list b/lib/libcrypto/Symbols.list
index 7d50c8a1bc8..ff90316a4c6 100644
--- a/lib/libcrypto/Symbols.list
+++ b/lib/libcrypto/Symbols.list
@@ -1003,9 +1003,6 @@ EC_POINT_set_compressed_coordinates_GFp
 EC_POINT_set_to_infinity
 EC_POINTs_make_affine
 EC_POINTs_mul
-EC_PRIVATEKEY_free
-EC_PRIVATEKEY_it
-EC_PRIVATEKEY_new
 EC_curve_nid2nist
 EC_curve_nist2nid
 EC_get_builtin_curves
@@ -3003,7 +3000,6 @@ d2i_ECParameters
 d2i_ECPrivateKey
 d2i_ECPrivateKey_bio
 d2i_ECPrivateKey_fp
-d2i_EC_PRIVATEKEY
 d2i_EC_PUBKEY
 d2i_EC_PUBKEY_bio
 d2i_EC_PUBKEY_fp
@@ -3192,7 +3188,6 @@ i2d_ECParameters
 i2d_ECPrivateKey
 i2d_ECPrivateKey_bio
 i2d_ECPrivateKey_fp
-i2d_EC_PRIVATEKEY
 i2d_EC_PUBKEY
 i2d_EC_PUBKEY_bio
 i2d_EC_PUBKEY_fp
diff --git a/lib/libcrypto/ec/ec_asn1.c b/lib/libcrypto/ec/ec_asn1.c
index 4bd95d6efcf..c1aedb47ee2 100644
--- a/lib/libcrypto/ec/ec_asn1.c
+++ b/lib/libcrypto/ec/ec_asn1.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ec_asn1.c,v 1.50 2024/04/15 15:42:23 tb Exp $ */
+/* $OpenBSD: ec_asn1.c,v 1.51 2024/04/15 15:44:15 tb Exp $ */
 /*
  * Written by Nils Larsch for the OpenSSL project.
  */
@@ -558,7 +558,7 @@ static const ASN1_TEMPLATE EC_PRIVATEKEY_seq_tt[] = {
 	},
 };
 
-const ASN1_ITEM EC_PRIVATEKEY_it = {
+static const ASN1_ITEM EC_PRIVATEKEY_it = {
 	.itype = ASN1_ITYPE_SEQUENCE,
 	.utype = V_ASN1_SEQUENCE,
 	.templates = EC_PRIVATEKEY_seq_tt,
@@ -568,31 +568,31 @@ const ASN1_ITEM EC_PRIVATEKEY_it = {
 	.sname = "EC_PRIVATEKEY",
 };
 
-EC_PRIVATEKEY *EC_PRIVATEKEY_new(void);
-void EC_PRIVATEKEY_free(EC_PRIVATEKEY *a);
-EC_PRIVATEKEY *d2i_EC_PRIVATEKEY(EC_PRIVATEKEY **a, const unsigned char **in, long len);
-int i2d_EC_PRIVATEKEY(const EC_PRIVATEKEY *a, unsigned char **out);
+static EC_PRIVATEKEY *EC_PRIVATEKEY_new(void);
+static void EC_PRIVATEKEY_free(EC_PRIVATEKEY *a);
+static EC_PRIVATEKEY *d2i_EC_PRIVATEKEY(EC_PRIVATEKEY **a, const unsigned char **in, long len);
+static int i2d_EC_PRIVATEKEY(const EC_PRIVATEKEY *a, unsigned char **out);
 
-EC_PRIVATEKEY *
+static EC_PRIVATEKEY *
 d2i_EC_PRIVATEKEY(EC_PRIVATEKEY **a, const unsigned char **in, long len)
 {
 	return (EC_PRIVATEKEY *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
 	    &EC_PRIVATEKEY_it);
 }
 
-int
+static int
 i2d_EC_PRIVATEKEY(const EC_PRIVATEKEY *a, unsigned char **out)
 {
 	return ASN1_item_i2d((ASN1_VALUE *)a, out, &EC_PRIVATEKEY_it);
 }
 
-EC_PRIVATEKEY *
+static EC_PRIVATEKEY *
 EC_PRIVATEKEY_new(void)
 {
 	return (EC_PRIVATEKEY *)ASN1_item_new(&EC_PRIVATEKEY_it);
 }
 
-void
+static void
 EC_PRIVATEKEY_free(EC_PRIVATEKEY *a)
 {
 	ASN1_item_free((ASN1_VALUE *)a, &EC_PRIVATEKEY_it);