From 35f2f589361b94bd10112b207a946e59cbada7aa Mon Sep 17 00:00:00 2001
From: tb <tb@openbsd.org>
Date: Fri, 28 Jul 2023 10:25:05 +0000
Subject: [PATCH] Remove OBJ_add_sigid() and OBJ_sigid_free()

Another bit of unused extensibility that was responsible for a lot
of complexity until recently. This removes the remaining stubs from
the public API.

ok jsing
---
 lib/libcrypto/Symbols.list             |  2 --
 lib/libcrypto/Symbols.namespace        |  2 --
 lib/libcrypto/hidden/openssl/objects.h |  4 +---
 lib/libcrypto/objects/obj_xref.c       | 15 +--------------
 lib/libcrypto/objects/objects.h        |  4 +---
 5 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/lib/libcrypto/Symbols.list b/lib/libcrypto/Symbols.list
index 8b865453084..b9ce49b2779 100644
--- a/lib/libcrypto/Symbols.list
+++ b/lib/libcrypto/Symbols.list
@@ -1734,7 +1734,6 @@ OBJ_NAME_init
 OBJ_NAME_new_index
 OBJ_NAME_remove
 OBJ_add_object
-OBJ_add_sigid
 OBJ_bsearch_
 OBJ_cleanup
 OBJ_cmp
@@ -1752,7 +1751,6 @@ OBJ_nid2obj
 OBJ_nid2sn
 OBJ_obj2nid
 OBJ_obj2txt
-OBJ_sigid_free
 OBJ_sn2nid
 OBJ_txt2nid
 OBJ_txt2obj
diff --git a/lib/libcrypto/Symbols.namespace b/lib/libcrypto/Symbols.namespace
index 18ad57448ed..50803c59bbc 100644
--- a/lib/libcrypto/Symbols.namespace
+++ b/lib/libcrypto/Symbols.namespace
@@ -2454,8 +2454,6 @@ _libre_OBJ_length
 _libre_OBJ_get0_data
 _libre_OBJ_find_sigid_algs
 _libre_OBJ_find_sigid_by_algs
-_libre_OBJ_add_sigid
-_libre_OBJ_sigid_free
 _libre_ERR_load_OBJ_strings
 _libre_CMAC_CTX_new
 _libre_CMAC_CTX_cleanup
diff --git a/lib/libcrypto/hidden/openssl/objects.h b/lib/libcrypto/hidden/openssl/objects.h
index f658a7cfa51..ba5bf8e25fa 100644
--- a/lib/libcrypto/hidden/openssl/objects.h
+++ b/lib/libcrypto/hidden/openssl/objects.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: objects.h,v 1.1 2023/07/08 12:27:51 beck Exp $ */
+/* $OpenBSD: objects.h,v 1.2 2023/07/28 10:25:05 tb Exp $ */
 /*
  * Copyright (c) 2023 Bob Beck <beck@openbsd.org>
  *
@@ -54,8 +54,6 @@ LCRYPTO_USED(OBJ_length);
 LCRYPTO_USED(OBJ_get0_data);
 LCRYPTO_USED(OBJ_find_sigid_algs);
 LCRYPTO_USED(OBJ_find_sigid_by_algs);
-LCRYPTO_USED(OBJ_add_sigid);
-LCRYPTO_USED(OBJ_sigid_free);
 LCRYPTO_USED(ERR_load_OBJ_strings);
 
 #endif /* _LIBCRYPTO_OBJECTS_H */
diff --git a/lib/libcrypto/objects/obj_xref.c b/lib/libcrypto/objects/obj_xref.c
index ae18d69af3a..0fca228ed84 100644
--- a/lib/libcrypto/objects/obj_xref.c
+++ b/lib/libcrypto/objects/obj_xref.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: obj_xref.c,v 1.12 2023/07/22 19:08:03 tb Exp $ */
+/*	$OpenBSD: obj_xref.c,v 1.13 2023/07/28 10:25:05 tb Exp $ */
 
 /*
  * Copyright (c) 2023 Theo Buehler <tb@openbsd.org>
@@ -310,16 +310,3 @@ OBJ_find_sigid_by_algs(int *sign_nid, int hash_nid, int pkey_nid)
 	return 0;
 }
 LCRYPTO_ALIAS(OBJ_find_sigid_by_algs);
-
-int
-OBJ_add_sigid(int sign_nid, int hash_nid, int pkey_nid)
-{
-	return 0;
-}
-LCRYPTO_ALIAS(OBJ_add_sigid);
-
-void
-OBJ_sigid_free(void)
-{
-}
-LCRYPTO_ALIAS(OBJ_sigid_free);
diff --git a/lib/libcrypto/objects/objects.h b/lib/libcrypto/objects/objects.h
index 91e4eb0d1d7..451545e0568 100644
--- a/lib/libcrypto/objects/objects.h
+++ b/lib/libcrypto/objects/objects.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: objects.h,v 1.22 2023/06/29 06:11:33 tb Exp $ */
+/* $OpenBSD: objects.h,v 1.23 2023/07/28 10:25:05 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -139,8 +139,6 @@ const unsigned char *OBJ_get0_data(const ASN1_OBJECT *obj);
 
 int OBJ_find_sigid_algs(int signid, int *pdig_nid, int *ppkey_nid);
 int OBJ_find_sigid_by_algs(int *psignid, int dig_nid, int pkey_nid);
-int OBJ_add_sigid(int signid, int dig_id, int pkey_id);
-void OBJ_sigid_free(void);
 
 void ERR_load_OBJ_strings(void);
 
-- 
2.20.1