From b70c5e97bce4eb0fbab98c2831c6159153756c23 Mon Sep 17 00:00:00 2001
From: tb <tb@openbsd.org>
Date: Sat, 2 Mar 2024 08:54:02 +0000
Subject: [PATCH] Remove ASN1_STRING_TABLE_{add,cleanup}

This was API for the ASN1_STRING_TABLE extensibility which has been
neutered for months and was completely unused in the ecosystem.

ok jsing
---
 lib/libcrypto/Symbols.list          |  2 --
 lib/libcrypto/Symbols.namespace     |  2 --
 lib/libcrypto/asn1/a_strnid.c       | 18 +-----------------
 lib/libcrypto/asn1/asn1.h           |  4 +---
 lib/libcrypto/hidden/openssl/asn1.h |  4 +---
 5 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/lib/libcrypto/Symbols.list b/lib/libcrypto/Symbols.list
index bb80f34cf50..e23944d189b 100644
--- a/lib/libcrypto/Symbols.list
+++ b/lib/libcrypto/Symbols.list
@@ -103,8 +103,6 @@ ASN1_PRINTABLE_type
 ASN1_SEQUENCE_ANY_it
 ASN1_SEQUENCE_it
 ASN1_SET_ANY_it
-ASN1_STRING_TABLE_add
-ASN1_STRING_TABLE_cleanup
 ASN1_STRING_TABLE_get
 ASN1_STRING_cmp
 ASN1_STRING_copy
diff --git a/lib/libcrypto/Symbols.namespace b/lib/libcrypto/Symbols.namespace
index bcd5b84ba66..d99d58bddc1 100644
--- a/lib/libcrypto/Symbols.namespace
+++ b/lib/libcrypto/Symbols.namespace
@@ -1093,8 +1093,6 @@ _libre_ASN1_mbstring_copy
 _libre_ASN1_mbstring_ncopy
 _libre_ASN1_STRING_set_by_NID
 _libre_ASN1_STRING_TABLE_get
-_libre_ASN1_STRING_TABLE_add
-_libre_ASN1_STRING_TABLE_cleanup
 _libre_ASN1_item_new
 _libre_ASN1_item_free
 _libre_ASN1_item_d2i
diff --git a/lib/libcrypto/asn1/a_strnid.c b/lib/libcrypto/asn1/a_strnid.c
index 6c0c0f095f8..5fa60b9ce7e 100644
--- a/lib/libcrypto/asn1/a_strnid.c
+++ b/lib/libcrypto/asn1/a_strnid.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: a_strnid.c,v 1.30 2024/03/02 08:50:47 tb Exp $ */
+/* $OpenBSD: a_strnid.c,v 1.31 2024/03/02 08:54:02 tb Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -327,19 +327,3 @@ ASN1_STRING_TABLE_get(int nid)
 	return NULL;
 }
 LCRYPTO_ALIAS(ASN1_STRING_TABLE_get);
-
-int
-ASN1_STRING_TABLE_add(int nid, long minsize, long maxsize, unsigned long mask,
-    unsigned long flags)
-{
-	ASN1error(ERR_R_DISABLED);
-	return 0;
-}
-LCRYPTO_ALIAS(ASN1_STRING_TABLE_add);
-
-void
-ASN1_STRING_TABLE_cleanup(void)
-{
-	ASN1error(ERR_R_DISABLED);
-}
-LCRYPTO_ALIAS(ASN1_STRING_TABLE_cleanup);
diff --git a/lib/libcrypto/asn1/asn1.h b/lib/libcrypto/asn1/asn1.h
index 1e66ee226cd..35f03e0064b 100644
--- a/lib/libcrypto/asn1/asn1.h
+++ b/lib/libcrypto/asn1/asn1.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: asn1.h,v 1.84 2024/03/02 08:50:47 tb Exp $ */
+/* $OpenBSD: asn1.h,v 1.85 2024/03/02 08:54:02 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -857,8 +857,6 @@ int ASN1_mbstring_ncopy(ASN1_STRING **out, const unsigned char *in, int len,
 ASN1_STRING *ASN1_STRING_set_by_NID(ASN1_STRING **out,
     const unsigned char *in, int inlen, int inform, int nid);
 const ASN1_STRING_TABLE *ASN1_STRING_TABLE_get(int nid);
-int ASN1_STRING_TABLE_add(int, long, long, unsigned long, unsigned long);
-void ASN1_STRING_TABLE_cleanup(void);
 
 /* ASN1 template functions */
 
diff --git a/lib/libcrypto/hidden/openssl/asn1.h b/lib/libcrypto/hidden/openssl/asn1.h
index 63852d1e678..39cb9ec6856 100644
--- a/lib/libcrypto/hidden/openssl/asn1.h
+++ b/lib/libcrypto/hidden/openssl/asn1.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: asn1.h,v 1.8 2024/03/01 07:38:33 tb Exp $ */
+/* $OpenBSD: asn1.h,v 1.9 2024/03/02 08:54:02 tb Exp $ */
 /*
  * Copyright (c) 2023 Bob Beck <beck@openbsd.org>
  *
@@ -222,8 +222,6 @@ LCRYPTO_USED(ASN1_mbstring_copy);
 LCRYPTO_USED(ASN1_mbstring_ncopy);
 LCRYPTO_USED(ASN1_STRING_set_by_NID);
 LCRYPTO_USED(ASN1_STRING_TABLE_get);
-LCRYPTO_USED(ASN1_STRING_TABLE_add);
-LCRYPTO_USED(ASN1_STRING_TABLE_cleanup);
 LCRYPTO_USED(ASN1_item_new);
 LCRYPTO_USED(ASN1_item_free);
 LCRYPTO_USED(ASN1_item_d2i);
-- 
2.20.1