diff options
Diffstat (limited to 'src/lib/libcrypto/cms')
| -rw-r--r-- | src/lib/libcrypto/cms/cms_err.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/lib/libcrypto/cms/cms_err.c b/src/lib/libcrypto/cms/cms_err.c index 5758a26db5..5431ab4bb8 100644 --- a/src/lib/libcrypto/cms/cms_err.c +++ b/src/lib/libcrypto/cms/cms_err.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: cms_err.c,v 1.14 2023/07/08 08:26:26 beck Exp $ */ | 1 | /* $OpenBSD: cms_err.c,v 1.15 2024/06/24 06:43:22 tb Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. | 3 | * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. |
| 4 | * | 4 | * |
| @@ -11,17 +11,19 @@ | |||
| 11 | #include <openssl/cms.h> | 11 | #include <openssl/cms.h> |
| 12 | #include <openssl/err.h> | 12 | #include <openssl/err.h> |
| 13 | 13 | ||
| 14 | #include "err_local.h" | ||
| 15 | |||
| 14 | #ifndef OPENSSL_NO_ERR | 16 | #ifndef OPENSSL_NO_ERR |
| 15 | 17 | ||
| 16 | #define ERR_FUNC(func) ERR_PACK(ERR_LIB_CMS,func,0) | 18 | #define ERR_FUNC(func) ERR_PACK(ERR_LIB_CMS,func,0) |
| 17 | #define ERR_REASON(reason) ERR_PACK(ERR_LIB_CMS,0,reason) | 19 | #define ERR_REASON(reason) ERR_PACK(ERR_LIB_CMS,0,reason) |
| 18 | 20 | ||
| 19 | static ERR_STRING_DATA CMS_str_functs[] = { | 21 | static const ERR_STRING_DATA CMS_str_functs[] = { |
| 20 | {ERR_FUNC(0xfff), "CRYPTO_internal"}, | 22 | {ERR_FUNC(0xfff), "CRYPTO_internal"}, |
| 21 | {0, NULL} | 23 | {0, NULL} |
| 22 | }; | 24 | }; |
| 23 | 25 | ||
| 24 | static ERR_STRING_DATA CMS_str_reasons[] = { | 26 | static const ERR_STRING_DATA CMS_str_reasons[] = { |
| 25 | {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_ADD_SIGNER_ERROR), "add signer error"}, | 27 | {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_ADD_SIGNER_ERROR), "add signer error"}, |
| 26 | {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CERTIFICATE_ALREADY_PRESENT), | 28 | {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CERTIFICATE_ALREADY_PRESENT), |
| 27 | "certificate already present"}, | 29 | "certificate already present"}, |
| @@ -155,8 +157,8 @@ ERR_load_CMS_strings(void) | |||
| 155 | { | 157 | { |
| 156 | #ifndef OPENSSL_NO_ERR | 158 | #ifndef OPENSSL_NO_ERR |
| 157 | if (ERR_func_error_string(CMS_str_functs[0].error) == NULL) { | 159 | if (ERR_func_error_string(CMS_str_functs[0].error) == NULL) { |
| 158 | ERR_load_strings(ERR_LIB_CMS, CMS_str_functs); | 160 | ERR_load_const_strings(CMS_str_functs); |
| 159 | ERR_load_strings(ERR_LIB_CMS, CMS_str_reasons); | 161 | ERR_load_const_strings(CMS_str_reasons); |
| 160 | } | 162 | } |
| 161 | #endif | 163 | #endif |
| 162 | return 1; | 164 | return 1; |
