diff options
| -rw-r--r-- | src/lib/libcrypto/evp/names.c | 5 | ||||
| -rw-r--r-- | src/lib/libcrypto/objects/objects.h | 7 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/lib/libcrypto/evp/names.c b/src/lib/libcrypto/evp/names.c index a27a187542..10ce13bb89 100644 --- a/src/lib/libcrypto/evp/names.c +++ b/src/lib/libcrypto/evp/names.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: names.c,v 1.16 2022/11/26 16:08:52 tb Exp $ */ | 1 | /* $OpenBSD: names.c,v 1.17 2023/06/29 06:11:33 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 | * |
| @@ -64,6 +64,9 @@ | |||
| 64 | 64 | ||
| 65 | #include "evp_local.h" | 65 | #include "evp_local.h" |
| 66 | 66 | ||
| 67 | extern int obj_cleanup_defer; | ||
| 68 | void check_defer(int nid); | ||
| 69 | |||
| 67 | int | 70 | int |
| 68 | EVP_add_cipher(const EVP_CIPHER *c) | 71 | EVP_add_cipher(const EVP_CIPHER *c) |
| 69 | { | 72 | { |
diff --git a/src/lib/libcrypto/objects/objects.h b/src/lib/libcrypto/objects/objects.h index 7fc11fa594..91e4eb0d1d 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.21 2022/11/13 14:03:13 tb Exp $ */ | 1 | /* $OpenBSD: objects.h,v 1.22 2023/06/29 06:11:33 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 | * |
| @@ -142,11 +142,6 @@ 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); | 142 | int OBJ_add_sigid(int signid, int dig_id, int pkey_id); |
| 143 | void OBJ_sigid_free(void); | 143 | void OBJ_sigid_free(void); |
| 144 | 144 | ||
| 145 | #if defined(LIBRESSL_CRYPTO_INTERNAL) | ||
| 146 | extern int obj_cleanup_defer; | ||
| 147 | void check_defer(int nid); | ||
| 148 | #endif | ||
| 149 | |||
| 150 | void ERR_load_OBJ_strings(void); | 145 | void ERR_load_OBJ_strings(void); |
| 151 | 146 | ||
| 152 | /* Error codes for the OBJ functions. */ | 147 | /* Error codes for the OBJ functions. */ |