5 files changed, 3 insertions, 82 deletions

diff --git a/src/lib/libcrypto/Symbols.list b/src/lib/libcrypto/Symbols.list
index 2acd158dd6..85ee8bf071 100644
--- a/src/lib/libcrypto/Symbols.list
+++ b/src/lib/libcrypto/Symbols.list
@@ -1686,14 +1686,8 @@ NETSCAPE_SPKI_verify
 NOTICEREF_free
 NOTICEREF_it
 NOTICEREF_new
-OBJ_NAME_add
-OBJ_NAME_cleanup
 OBJ_NAME_do_all
 OBJ_NAME_do_all_sorted
-OBJ_NAME_get
-OBJ_NAME_init
-OBJ_NAME_new_index
-OBJ_NAME_remove
 OBJ_add_object
 OBJ_bsearch_
 OBJ_cleanup
diff --git a/src/lib/libcrypto/Symbols.namespace b/src/lib/libcrypto/Symbols.namespace
index 12575c1128..936526085c 100644
--- a/src/lib/libcrypto/Symbols.namespace
+++ b/src/lib/libcrypto/Symbols.namespace
@@ -2395,12 +2395,6 @@ _libre_RSA_meth_set_sign
 _libre_RSA_meth_get_verify
 _libre_RSA_meth_set_verify
 _libre_ERR_load_RSA_strings
-_libre_OBJ_NAME_init
-_libre_OBJ_NAME_new_index
-_libre_OBJ_NAME_get
-_libre_OBJ_NAME_add
-_libre_OBJ_NAME_remove
-_libre_OBJ_NAME_cleanup
 _libre_OBJ_NAME_do_all
 _libre_OBJ_NAME_do_all_sorted
 _libre_OBJ_dup
diff --git a/src/lib/libcrypto/evp/evp_names.c b/src/lib/libcrypto/evp/evp_names.c
index a3af2ed1a6..ad325bad35 100644
--- a/src/lib/libcrypto/evp/evp_names.c
+++ b/src/lib/libcrypto/evp/evp_names.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: evp_names.c,v 1.9 2024/03/02 09:36:40 tb Exp $ */
+/*      $OpenBSD: evp_names.c,v 1.10 2024/03/02 09:41:02 tb Exp $ */
 /*
  * Copyright (c) 2023 Theo Buehler <tb@openbsd.org>
  *
@@ -1914,55 +1914,3 @@ void
 EVP_cleanup(void)
 {
 }
-
-/*
- * XXX - Remove all the garbage below in the next bump.
- */
-
-int
-OBJ_NAME_init(void)
-{
-        OBJerror(ERR_R_DISABLED);
-        return 0;
-}
-LCRYPTO_ALIAS(OBJ_NAME_init);
-
-int
-OBJ_NAME_new_index(unsigned long (*hash_func)(const char *),
-    int (*cmp_func)(const char *, const char *),
-    void (*free_func)(const char *, int, const char *))
-{
-        OBJerror(ERR_R_DISABLED);
-        return 0;
-}
-LCRYPTO_ALIAS(OBJ_NAME_new_index);
-
-const char *
-OBJ_NAME_get(const char *name, int type)
-{
-        OBJerror(ERR_R_DISABLED);
-        return NULL;
-}
-LCRYPTO_ALIAS(OBJ_NAME_get);
-
-int
-OBJ_NAME_add(const char *name, int type, const char *data)
-{
-        /* No error to avoid polluting xca's error stack. */
-        return 0;
-}
-LCRYPTO_ALIAS(OBJ_NAME_add);
-
-int
-OBJ_NAME_remove(const char *name, int type)
-{
-        OBJerror(ERR_R_DISABLED);
-        return 0;
-}
-LCRYPTO_ALIAS(OBJ_NAME_remove);
-
-void
-OBJ_NAME_cleanup(int type)
-{
-}
-LCRYPTO_ALIAS(OBJ_NAME_cleanup);
diff --git a/src/lib/libcrypto/hidden/openssl/objects.h b/src/lib/libcrypto/hidden/openssl/objects.h
index ba5bf8e25f..80c0644137 100644
--- a/src/lib/libcrypto/hidden/openssl/objects.h
+++ b/src/lib/libcrypto/hidden/openssl/objects.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: objects.h,v 1.2 2023/07/28 10:25:05 tb Exp $ */
+/* $OpenBSD: objects.h,v 1.3 2024/03/02 09:41:02 tb Exp $ */
 /*
  * Copyright (c) 2023 Bob Beck <beck@openbsd.org>
  *
@@ -25,12 +25,6 @@
 #endif
 #include "crypto_namespace.h"
 
-LCRYPTO_USED(OBJ_NAME_init);
-LCRYPTO_USED(OBJ_NAME_new_index);
-LCRYPTO_USED(OBJ_NAME_get);
-LCRYPTO_USED(OBJ_NAME_add);
-LCRYPTO_USED(OBJ_NAME_remove);
-LCRYPTO_USED(OBJ_NAME_cleanup);
 LCRYPTO_USED(OBJ_NAME_do_all);
 LCRYPTO_USED(OBJ_NAME_do_all_sorted);
 LCRYPTO_USED(OBJ_dup);
diff --git a/src/lib/libcrypto/objects/objects.h b/src/lib/libcrypto/objects/objects.h
index 451545e056..37570a5c80 100644
--- a/src/lib/libcrypto/objects/objects.h
+++ b/src/lib/libcrypto/objects/objects.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: objects.h,v 1.23 2023/07/28 10:25:05 tb Exp $ */
+/* $OpenBSD: objects.h,v 1.24 2024/03/02 09:41:02 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -94,15 +94,6 @@ typedef struct obj_name_st {
 
 #define         OBJ_create_and_add_object(a,b,c) OBJ_create(a,b,c)
 
-
-int OBJ_NAME_init(void);
-int OBJ_NAME_new_index(unsigned long (*hash_func)(const char *),
-    int (*cmp_func)(const char *, const char *),
-    void (*free_func)(const char *, int, const char *));
-const char *OBJ_NAME_get(const char *name, int type);
-int OBJ_NAME_add(const char *name, int type, const char *data);
-int OBJ_NAME_remove(const char *name, int type);
-void OBJ_NAME_cleanup(int type); /* -1 for everything */
 void OBJ_NAME_do_all(int type, void (*fn)(const OBJ_NAME *, void *arg),
     void *arg);
 void OBJ_NAME_do_all_sorted(int type, void (*fn)(const OBJ_NAME *, void *arg),