diff options
Diffstat (limited to 'src/lib/libcrypto/conf')
| -rw-r--r-- | src/lib/libcrypto/conf/conf_err.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/lib/libcrypto/conf/conf_err.c b/src/lib/libcrypto/conf/conf_err.c index 9a44f22fa2..5100847d89 100644 --- a/src/lib/libcrypto/conf/conf_err.c +++ b/src/lib/libcrypto/conf/conf_err.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: conf_err.c,v 1.16 2024/04/09 13:56:30 beck Exp $ */ | 1 | /* $OpenBSD: conf_err.c,v 1.17 2024/06/24 06:43:22 tb Exp $ */ |
| 2 | /* ==================================================================== | 2 | /* ==================================================================== |
| 3 | * Copyright (c) 1999-2007 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 1999-2007 The OpenSSL Project. All rights reserved. |
| 4 | * | 4 | * |
| @@ -60,17 +60,19 @@ | |||
| 60 | #include <openssl/conf.h> | 60 | #include <openssl/conf.h> |
| 61 | #include <openssl/err.h> | 61 | #include <openssl/err.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_CONF,func,0) | 67 | #define ERR_FUNC(func) ERR_PACK(ERR_LIB_CONF,func,0) |
| 66 | #define ERR_REASON(reason) ERR_PACK(ERR_LIB_CONF,0,reason) | 68 | #define ERR_REASON(reason) ERR_PACK(ERR_LIB_CONF,0,reason) |
| 67 | 69 | ||
| 68 | static ERR_STRING_DATA CONF_str_functs[]= { | 70 | static const ERR_STRING_DATA CONF_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 CONF_str_reasons[]= { | 75 | static const ERR_STRING_DATA CONF_str_reasons[] = { |
| 74 | {ERR_REASON(CONF_R_ERROR_LOADING_DSO) , "error loading dso"}, | 76 | {ERR_REASON(CONF_R_ERROR_LOADING_DSO) , "error loading dso"}, |
| 75 | {ERR_REASON(CONF_R_LIST_CANNOT_BE_NULL) , "list cannot be null"}, | 77 | {ERR_REASON(CONF_R_LIST_CANNOT_BE_NULL) , "list cannot be null"}, |
| 76 | {ERR_REASON(CONF_R_MISSING_CLOSE_SQUARE_BRACKET), "missing close square bracket"}, | 78 | {ERR_REASON(CONF_R_MISSING_CLOSE_SQUARE_BRACKET), "missing close square bracket"}, |
| @@ -98,8 +100,8 @@ ERR_load_CONF_strings(void) | |||
| 98 | { | 100 | { |
| 99 | #ifndef OPENSSL_NO_ERR | 101 | #ifndef OPENSSL_NO_ERR |
| 100 | if (ERR_func_error_string(CONF_str_functs[0].error) == NULL) { | 102 | if (ERR_func_error_string(CONF_str_functs[0].error) == NULL) { |
| 101 | ERR_load_strings(0, CONF_str_functs); | 103 | ERR_load_const_strings(CONF_str_functs); |
| 102 | ERR_load_strings(0, CONF_str_reasons); | 104 | ERR_load_const_strings(CONF_str_reasons); |
| 103 | } | 105 | } |
| 104 | #endif | 106 | #endif |
| 105 | } | 107 | } |
