summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/libcrypto/Symbols.list2
-rw-r--r--src/lib/libcrypto/Symbols.namespace2
-rw-r--r--src/lib/libcrypto/hidden/openssl/objects.h4
-rw-r--r--src/lib/libcrypto/objects/obj_xref.c15
-rw-r--r--src/lib/libcrypto/objects/objects.h4
5 files changed, 3 insertions, 24 deletions
diff --git a/src/lib/libcrypto/Symbols.list b/src/lib/libcrypto/Symbols.list
index 8b86545308..b9ce49b277 100644
--- a/src/lib/libcrypto/Symbols.list
+++ b/src/lib/libcrypto/Symbols.list
@@ -1734,7 +1734,6 @@ OBJ_NAME_init
1734OBJ_NAME_new_index 1734OBJ_NAME_new_index
1735OBJ_NAME_remove 1735OBJ_NAME_remove
1736OBJ_add_object 1736OBJ_add_object
1737OBJ_add_sigid
1738OBJ_bsearch_ 1737OBJ_bsearch_
1739OBJ_cleanup 1738OBJ_cleanup
1740OBJ_cmp 1739OBJ_cmp
@@ -1752,7 +1751,6 @@ OBJ_nid2obj
1752OBJ_nid2sn 1751OBJ_nid2sn
1753OBJ_obj2nid 1752OBJ_obj2nid
1754OBJ_obj2txt 1753OBJ_obj2txt
1755OBJ_sigid_free
1756OBJ_sn2nid 1754OBJ_sn2nid
1757OBJ_txt2nid 1755OBJ_txt2nid
1758OBJ_txt2obj 1756OBJ_txt2obj
diff --git a/src/lib/libcrypto/Symbols.namespace b/src/lib/libcrypto/Symbols.namespace
index 18ad57448e..50803c59bb 100644
--- a/src/lib/libcrypto/Symbols.namespace
+++ b/src/lib/libcrypto/Symbols.namespace
@@ -2454,8 +2454,6 @@ _libre_OBJ_length
2454_libre_OBJ_get0_data 2454_libre_OBJ_get0_data
2455_libre_OBJ_find_sigid_algs 2455_libre_OBJ_find_sigid_algs
2456_libre_OBJ_find_sigid_by_algs 2456_libre_OBJ_find_sigid_by_algs
2457_libre_OBJ_add_sigid
2458_libre_OBJ_sigid_free
2459_libre_ERR_load_OBJ_strings 2457_libre_ERR_load_OBJ_strings
2460_libre_CMAC_CTX_new 2458_libre_CMAC_CTX_new
2461_libre_CMAC_CTX_cleanup 2459_libre_CMAC_CTX_cleanup
diff --git a/src/lib/libcrypto/hidden/openssl/objects.h b/src/lib/libcrypto/hidden/openssl/objects.h
index f658a7cfa5..ba5bf8e25f 100644
--- a/src/lib/libcrypto/hidden/openssl/objects.h
+++ b/src/lib/libcrypto/hidden/openssl/objects.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: objects.h,v 1.1 2023/07/08 12:27:51 beck Exp $ */ 1/* $OpenBSD: objects.h,v 1.2 2023/07/28 10:25:05 tb Exp $ */
2/* 2/*
3 * Copyright (c) 2023 Bob Beck <beck@openbsd.org> 3 * Copyright (c) 2023 Bob Beck <beck@openbsd.org>
4 * 4 *
@@ -54,8 +54,6 @@ LCRYPTO_USED(OBJ_length);
54LCRYPTO_USED(OBJ_get0_data); 54LCRYPTO_USED(OBJ_get0_data);
55LCRYPTO_USED(OBJ_find_sigid_algs); 55LCRYPTO_USED(OBJ_find_sigid_algs);
56LCRYPTO_USED(OBJ_find_sigid_by_algs); 56LCRYPTO_USED(OBJ_find_sigid_by_algs);
57LCRYPTO_USED(OBJ_add_sigid);
58LCRYPTO_USED(OBJ_sigid_free);
59LCRYPTO_USED(ERR_load_OBJ_strings); 57LCRYPTO_USED(ERR_load_OBJ_strings);
60 58
61#endif /* _LIBCRYPTO_OBJECTS_H */ 59#endif /* _LIBCRYPTO_OBJECTS_H */
diff --git a/src/lib/libcrypto/objects/obj_xref.c b/src/lib/libcrypto/objects/obj_xref.c
index ae18d69af3..0fca228ed8 100644
--- a/src/lib/libcrypto/objects/obj_xref.c
+++ b/src/lib/libcrypto/objects/obj_xref.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: obj_xref.c,v 1.12 2023/07/22 19:08:03 tb Exp $ */ 1/* $OpenBSD: obj_xref.c,v 1.13 2023/07/28 10:25:05 tb Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2023 Theo Buehler <tb@openbsd.org> 4 * 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)
310 return 0; 310 return 0;
311} 311}
312LCRYPTO_ALIAS(OBJ_find_sigid_by_algs); 312LCRYPTO_ALIAS(OBJ_find_sigid_by_algs);
313
314int
315OBJ_add_sigid(int sign_nid, int hash_nid, int pkey_nid)
316{
317 return 0;
318}
319LCRYPTO_ALIAS(OBJ_add_sigid);
320
321void
322OBJ_sigid_free(void)
323{
324}
325LCRYPTO_ALIAS(OBJ_sigid_free);
diff --git a/src/lib/libcrypto/objects/objects.h b/src/lib/libcrypto/objects/objects.h
index 91e4eb0d1d..451545e056 100644
--- a/src/lib/libcrypto/objects/objects.h
+++ b/src/lib/libcrypto/objects/objects.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: objects.h,v 1.22 2023/06/29 06:11:33 tb Exp $ */ 1/* $OpenBSD: objects.h,v 1.23 2023/07/28 10:25:05 tb Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -139,8 +139,6 @@ const unsigned char *OBJ_get0_data(const ASN1_OBJECT *obj);
139 139
140int OBJ_find_sigid_algs(int signid, int *pdig_nid, int *ppkey_nid); 140int OBJ_find_sigid_algs(int signid, int *pdig_nid, int *ppkey_nid);
141int OBJ_find_sigid_by_algs(int *psignid, int dig_nid, int pkey_nid); 141int OBJ_find_sigid_by_algs(int *psignid, int dig_nid, int pkey_nid);
142int OBJ_add_sigid(int signid, int dig_id, int pkey_id);
143void OBJ_sigid_free(void);
144 142
145void ERR_load_OBJ_strings(void); 143void ERR_load_OBJ_strings(void);
146 144