diff options
Diffstat (limited to 'src/lib/libcrypto/pem')
| -rw-r--r-- | src/lib/libcrypto/pem/pem_err.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/lib/libcrypto/pem/pem_err.c b/src/lib/libcrypto/pem/pem_err.c index a94e2d5ebb..05025c8ee0 100644 --- a/src/lib/libcrypto/pem/pem_err.c +++ b/src/lib/libcrypto/pem/pem_err.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: pem_err.c,v 1.14 2023/07/07 13:40:44 beck Exp $ */ | 1 | /* $OpenBSD: pem_err.c,v 1.15 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/err.h> | 60 | #include <openssl/err.h> |
| 61 | #include <openssl/pem.h> | 61 | #include <openssl/pem.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_PEM,func,0) | 67 | #define ERR_FUNC(func) ERR_PACK(ERR_LIB_PEM,func,0) |
| 66 | #define ERR_REASON(reason) ERR_PACK(ERR_LIB_PEM,0,reason) | 68 | #define ERR_REASON(reason) ERR_PACK(ERR_LIB_PEM,0,reason) |
| 67 | 69 | ||
| 68 | static ERR_STRING_DATA PEM_str_functs[] = { | 70 | static const ERR_STRING_DATA PEM_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 PEM_str_reasons[] = { | 75 | static const ERR_STRING_DATA PEM_str_reasons[] = { |
| 74 | {ERR_REASON(PEM_R_BAD_BASE64_DECODE) , "bad base64 decode"}, | 76 | {ERR_REASON(PEM_R_BAD_BASE64_DECODE) , "bad base64 decode"}, |
| 75 | {ERR_REASON(PEM_R_BAD_DECRYPT) , "bad decrypt"}, | 77 | {ERR_REASON(PEM_R_BAD_DECRYPT) , "bad decrypt"}, |
| 76 | {ERR_REASON(PEM_R_BAD_END_LINE) , "bad end line"}, | 78 | {ERR_REASON(PEM_R_BAD_END_LINE) , "bad end line"}, |
| @@ -109,8 +111,8 @@ ERR_load_PEM_strings(void) | |||
| 109 | { | 111 | { |
| 110 | #ifndef OPENSSL_NO_ERR | 112 | #ifndef OPENSSL_NO_ERR |
| 111 | if (ERR_func_error_string(PEM_str_functs[0].error) == NULL) { | 113 | if (ERR_func_error_string(PEM_str_functs[0].error) == NULL) { |
| 112 | ERR_load_strings(0, PEM_str_functs); | 114 | ERR_load_const_strings(PEM_str_functs); |
| 113 | ERR_load_strings(0, PEM_str_reasons); | 115 | ERR_load_const_strings(PEM_str_reasons); |
| 114 | } | 116 | } |
| 115 | #endif | 117 | #endif |
| 116 | } | 118 | } |
