diff options
Diffstat (limited to 'src/lib/libcrypto/objects')
| -rw-r--r-- | src/lib/libcrypto/objects/obj_err.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/lib/libcrypto/objects/obj_err.c b/src/lib/libcrypto/objects/obj_err.c index 04cb4218c2..514fb0d4f0 100644 --- a/src/lib/libcrypto/objects/obj_err.c +++ b/src/lib/libcrypto/objects/obj_err.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: obj_err.c,v 1.14 2023/07/08 12:27:51 beck Exp $ */ | 1 | /* $OpenBSD: obj_err.c,v 1.15 2024/06/24 06:43:22 tb Exp $ */ |
| 2 | /* ==================================================================== | 2 | /* ==================================================================== |
| 3 | * Copyright (c) 1999-2006 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 1999-2006 The OpenSSL Project. All rights reserved. |
| 4 | * | 4 | * |
| @@ -60,17 +60,19 @@ | |||
| 60 | #include <openssl/err.h> | 60 | #include <openssl/err.h> |
| 61 | #include <openssl/objects.h> | 61 | #include <openssl/objects.h> |
| 62 | 62 | ||
| 63 | #include "err_local.h" | ||
| 64 | |||
| 63 | #ifndef OPENSSL_NO_ERR | 65 | #ifndef OPENSSL_NO_ERR |
| 64 | 66 | ||
| 65 | #define ERR_FUNC(func) ERR_PACK(ERR_LIB_OBJ,func,0) | 67 | #define ERR_FUNC(func) ERR_PACK(ERR_LIB_OBJ,func,0) |
| 66 | #define ERR_REASON(reason) ERR_PACK(ERR_LIB_OBJ,0,reason) | 68 | #define ERR_REASON(reason) ERR_PACK(ERR_LIB_OBJ,0,reason) |
| 67 | 69 | ||
| 68 | static ERR_STRING_DATA OBJ_str_functs[] = { | 70 | static const ERR_STRING_DATA OBJ_str_functs[] = { |
| 69 | {ERR_FUNC(0xfff), "CRYPTO_internal"}, | 71 | {ERR_FUNC(0xfff), "CRYPTO_internal"}, |
| 70 | {0, NULL} | 72 | {0, NULL} |
| 71 | }; | 73 | }; |
| 72 | 74 | ||
| 73 | static ERR_STRING_DATA OBJ_str_reasons[] = { | 75 | static const ERR_STRING_DATA OBJ_str_reasons[] = { |
| 74 | {ERR_REASON(OBJ_R_MALLOC_FAILURE) , "malloc failure"}, | 76 | {ERR_REASON(OBJ_R_MALLOC_FAILURE) , "malloc failure"}, |
| 75 | {ERR_REASON(OBJ_R_UNKNOWN_NID) , "unknown nid"}, | 77 | {ERR_REASON(OBJ_R_UNKNOWN_NID) , "unknown nid"}, |
| 76 | {0, NULL} | 78 | {0, NULL} |
| @@ -83,8 +85,8 @@ ERR_load_OBJ_strings(void) | |||
| 83 | { | 85 | { |
| 84 | #ifndef OPENSSL_NO_ERR | 86 | #ifndef OPENSSL_NO_ERR |
| 85 | if (ERR_func_error_string(OBJ_str_functs[0].error) == NULL) { | 87 | if (ERR_func_error_string(OBJ_str_functs[0].error) == NULL) { |
| 86 | ERR_load_strings(0, OBJ_str_functs); | 88 | ERR_load_const_strings(OBJ_str_functs); |
| 87 | ERR_load_strings(0, OBJ_str_reasons); | 89 | ERR_load_const_strings(OBJ_str_reasons); |
| 88 | } | 90 | } |
| 89 | #endif | 91 | #endif |
| 90 | } | 92 | } |
