From: tb <tb@openbsd.org>
Date: Fri, 29 Dec 2023 10:08:44 +0000 (+0000)
Subject: Move EVP_PKEY_asn1_add* to the end of the file
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=884b7e42371eec0e232c112a2b709290ae5f8da4;p=openbsd

Move EVP_PKEY_asn1_add* to the end of the file

Also add a reminder to remove most of the public API in this file.
---

diff --git a/lib/libcrypto/asn1/ameth_lib.c b/lib/libcrypto/asn1/ameth_lib.c
index 656d9036f84..f9ddf5dcd1d 100644
--- a/lib/libcrypto/asn1/ameth_lib.c
+++ b/lib/libcrypto/asn1/ameth_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ameth_lib.c,v 1.37 2023/12/15 21:55:47 tb Exp $ */
+/* $OpenBSD: ameth_lib.c,v 1.38 2023/12/29 10:08:44 tb Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2006.
  */
@@ -176,20 +176,6 @@ EVP_PKEY_asn1_find_str(ENGINE **pe, const char *str, int len)
 	return NULL;
 }
 
-int
-EVP_PKEY_asn1_add0(const EVP_PKEY_ASN1_METHOD *ameth)
-{
-	EVPerror(ERR_R_DISABLED);
-	return 0;
-}
-
-int
-EVP_PKEY_asn1_add_alias(int to, int from)
-{
-	EVPerror(ERR_R_DISABLED);
-	return 0;
-}
-
 int
 EVP_PKEY_asn1_get0_info(int *ppkey_id, int *ppkey_base_id, int *ppkey_flags,
     const char **pinfo, const char **ppem_str,
@@ -216,6 +202,10 @@ EVP_PKEY_get0_asn1(const EVP_PKEY *pkey)
 	return pkey->ameth;
 }
 
+/*
+ * XXX - remove all the API below here in the next major bump.
+ */
+
 EVP_PKEY_ASN1_METHOD*
 EVP_PKEY_asn1_new(int id, int flags, const char *pem_str, const char *info)
 {
@@ -364,3 +354,18 @@ EVP_PKEY_asn1_set_param_check(EVP_PKEY_ASN1_METHOD *ameth,
 {
 	ameth->pkey_param_check = pkey_param_check;
 }
+
+int
+EVP_PKEY_asn1_add0(const EVP_PKEY_ASN1_METHOD *ameth)
+{
+	EVPerror(ERR_R_DISABLED);
+	return 0;
+}
+
+int
+EVP_PKEY_asn1_add_alias(int to, int from)
+{
+	EVPerror(ERR_R_DISABLED);
+	return 0;
+}
+