diff options
Diffstat (limited to 'src/lib/libcrypto/evp')
| -rw-r--r-- | src/lib/libcrypto/evp/evp_err.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/lib/libcrypto/evp/evp_err.c b/src/lib/libcrypto/evp/evp_err.c index 07515f4d99..a41339c775 100644 --- a/src/lib/libcrypto/evp/evp_err.c +++ b/src/lib/libcrypto/evp/evp_err.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: evp_err.c,v 1.33 2024/04/09 13:52:41 beck Exp $ */ | 1 | /* $OpenBSD: evp_err.c,v 1.34 2024/06/24 06:43:22 tb Exp $ */ |
| 2 | /* ==================================================================== | 2 | /* ==================================================================== |
| 3 | * Copyright (c) 1999-2011 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 1999-2011 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/evp.h> | 61 | #include <openssl/evp.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_EVP,func,0) | 67 | #define ERR_FUNC(func) ERR_PACK(ERR_LIB_EVP,func,0) |
| 66 | #define ERR_REASON(reason) ERR_PACK(ERR_LIB_EVP,0,reason) | 68 | #define ERR_REASON(reason) ERR_PACK(ERR_LIB_EVP,0,reason) |
| 67 | 69 | ||
| 68 | static ERR_STRING_DATA EVP_str_functs[] = { | 70 | static const ERR_STRING_DATA EVP_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 EVP_str_reasons[] = { | 75 | static const ERR_STRING_DATA EVP_str_reasons[] = { |
| 74 | {ERR_REASON(EVP_R_AES_IV_SETUP_FAILED) , "aes iv setup failed"}, | 76 | {ERR_REASON(EVP_R_AES_IV_SETUP_FAILED) , "aes iv setup failed"}, |
| 75 | {ERR_REASON(EVP_R_AES_KEY_SETUP_FAILED) , "aes key setup failed"}, | 77 | {ERR_REASON(EVP_R_AES_KEY_SETUP_FAILED) , "aes key setup failed"}, |
| 76 | {ERR_REASON(EVP_R_ASN1_LIB) , "asn1 lib"}, | 78 | {ERR_REASON(EVP_R_ASN1_LIB) , "asn1 lib"}, |
| @@ -159,8 +161,8 @@ ERR_load_EVP_strings(void) | |||
| 159 | { | 161 | { |
| 160 | #ifndef OPENSSL_NO_ERR | 162 | #ifndef OPENSSL_NO_ERR |
| 161 | if (ERR_func_error_string(EVP_str_functs[0].error) == NULL) { | 163 | if (ERR_func_error_string(EVP_str_functs[0].error) == NULL) { |
| 162 | ERR_load_strings(0, EVP_str_functs); | 164 | ERR_load_const_strings(EVP_str_functs); |
| 163 | ERR_load_strings(0, EVP_str_reasons); | 165 | ERR_load_const_strings(EVP_str_reasons); |
| 164 | } | 166 | } |
| 165 | #endif | 167 | #endif |
| 166 | } | 168 | } |
