diff options
Diffstat (limited to 'src/lib/libcrypto/pkcs12')
-rw-r--r-- | src/lib/libcrypto/pkcs12/pk12err.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/lib/libcrypto/pkcs12/pk12err.c b/src/lib/libcrypto/pkcs12/pk12err.c index 3af03528a2..c04c83c4f1 100644 --- a/src/lib/libcrypto/pkcs12/pk12err.c +++ b/src/lib/libcrypto/pkcs12/pk12err.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: pk12err.c,v 1.14 2023/02/16 08:38:17 tb Exp $ */ | 1 | /* $OpenBSD: pk12err.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/pkcs12.h> | 61 | #include <openssl/pkcs12.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_PKCS12,func,0) | 67 | #define ERR_FUNC(func) ERR_PACK(ERR_LIB_PKCS12,func,0) |
66 | #define ERR_REASON(reason) ERR_PACK(ERR_LIB_PKCS12,0,reason) | 68 | #define ERR_REASON(reason) ERR_PACK(ERR_LIB_PKCS12,0,reason) |
67 | 69 | ||
68 | static ERR_STRING_DATA PKCS12_str_functs[]= { | 70 | static const ERR_STRING_DATA PKCS12_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 PKCS12_str_reasons[]= { | 75 | static const ERR_STRING_DATA PKCS12_str_reasons[] = { |
74 | {ERR_REASON(PKCS12_R_CANT_PACK_STRUCTURE), "cant pack structure"}, | 76 | {ERR_REASON(PKCS12_R_CANT_PACK_STRUCTURE), "cant pack structure"}, |
75 | {ERR_REASON(PKCS12_R_CONTENT_TYPE_NOT_DATA), "content type not data"}, | 77 | {ERR_REASON(PKCS12_R_CONTENT_TYPE_NOT_DATA), "content type not data"}, |
76 | {ERR_REASON(PKCS12_R_DECODE_ERROR) , "decode error"}, | 78 | {ERR_REASON(PKCS12_R_DECODE_ERROR) , "decode error"}, |
@@ -103,8 +105,8 @@ ERR_load_PKCS12_strings(void) | |||
103 | { | 105 | { |
104 | #ifndef OPENSSL_NO_ERR | 106 | #ifndef OPENSSL_NO_ERR |
105 | if (ERR_func_error_string(PKCS12_str_functs[0].error) == NULL) { | 107 | if (ERR_func_error_string(PKCS12_str_functs[0].error) == NULL) { |
106 | ERR_load_strings(0, PKCS12_str_functs); | 108 | ERR_load_const_strings(PKCS12_str_functs); |
107 | ERR_load_strings(0, PKCS12_str_reasons); | 109 | ERR_load_const_strings(PKCS12_str_reasons); |
108 | } | 110 | } |
109 | #endif | 111 | #endif |
110 | } | 112 | } |