diff options
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/libcrypto/Symbols.list | 2 | ||||
-rw-r--r-- | src/lib/libcrypto/Symbols.namespace | 2 | ||||
-rw-r--r-- | src/lib/libcrypto/hidden/openssl/objects.h | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/objects/obj_xref.c | 15 | ||||
-rw-r--r-- | src/lib/libcrypto/objects/objects.h | 4 |
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 | |||
1734 | OBJ_NAME_new_index | 1734 | OBJ_NAME_new_index |
1735 | OBJ_NAME_remove | 1735 | OBJ_NAME_remove |
1736 | OBJ_add_object | 1736 | OBJ_add_object |
1737 | OBJ_add_sigid | ||
1738 | OBJ_bsearch_ | 1737 | OBJ_bsearch_ |
1739 | OBJ_cleanup | 1738 | OBJ_cleanup |
1740 | OBJ_cmp | 1739 | OBJ_cmp |
@@ -1752,7 +1751,6 @@ OBJ_nid2obj | |||
1752 | OBJ_nid2sn | 1751 | OBJ_nid2sn |
1753 | OBJ_obj2nid | 1752 | OBJ_obj2nid |
1754 | OBJ_obj2txt | 1753 | OBJ_obj2txt |
1755 | OBJ_sigid_free | ||
1756 | OBJ_sn2nid | 1754 | OBJ_sn2nid |
1757 | OBJ_txt2nid | 1755 | OBJ_txt2nid |
1758 | OBJ_txt2obj | 1756 | OBJ_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); | |||
54 | LCRYPTO_USED(OBJ_get0_data); | 54 | LCRYPTO_USED(OBJ_get0_data); |
55 | LCRYPTO_USED(OBJ_find_sigid_algs); | 55 | LCRYPTO_USED(OBJ_find_sigid_algs); |
56 | LCRYPTO_USED(OBJ_find_sigid_by_algs); | 56 | LCRYPTO_USED(OBJ_find_sigid_by_algs); |
57 | LCRYPTO_USED(OBJ_add_sigid); | ||
58 | LCRYPTO_USED(OBJ_sigid_free); | ||
59 | LCRYPTO_USED(ERR_load_OBJ_strings); | 57 | LCRYPTO_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 | } |
312 | LCRYPTO_ALIAS(OBJ_find_sigid_by_algs); | 312 | LCRYPTO_ALIAS(OBJ_find_sigid_by_algs); |
313 | |||
314 | int | ||
315 | OBJ_add_sigid(int sign_nid, int hash_nid, int pkey_nid) | ||
316 | { | ||
317 | return 0; | ||
318 | } | ||
319 | LCRYPTO_ALIAS(OBJ_add_sigid); | ||
320 | |||
321 | void | ||
322 | OBJ_sigid_free(void) | ||
323 | { | ||
324 | } | ||
325 | LCRYPTO_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 | ||
140 | int OBJ_find_sigid_algs(int signid, int *pdig_nid, int *ppkey_nid); | 140 | int OBJ_find_sigid_algs(int signid, int *pdig_nid, int *ppkey_nid); |
141 | int OBJ_find_sigid_by_algs(int *psignid, int dig_nid, int pkey_nid); | 141 | int OBJ_find_sigid_by_algs(int *psignid, int dig_nid, int pkey_nid); |
142 | int OBJ_add_sigid(int signid, int dig_id, int pkey_id); | ||
143 | void OBJ_sigid_free(void); | ||
144 | 142 | ||
145 | void ERR_load_OBJ_strings(void); | 143 | void ERR_load_OBJ_strings(void); |
146 | 144 | ||