diff options
author | jsing <> | 2019-08-11 14:18:38 +0000 |
---|---|---|
committer | jsing <> | 2019-08-11 14:18:38 +0000 |
commit | 66b8eee1f4c16577aa18b418806e6d168950262b (patch) | |
tree | d3db70ca3471a22a2364c1b2a0bdd4e3626f6eb3 | |
parent | e55c723dcf76506842fac27cf5d820ecf55863a5 (diff) | |
download | openbsd-66b8eee1f4c16577aa18b418806e6d168950262b.tar.gz openbsd-66b8eee1f4c16577aa18b418806e6d168950262b.tar.bz2 openbsd-66b8eee1f4c16577aa18b418806e6d168950262b.zip |
Fix loading of CMS error strings.
-rw-r--r-- | src/lib/libcrypto/cms/cms_err.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/libcrypto/cms/cms_err.c b/src/lib/libcrypto/cms/cms_err.c index de7c544a50..9b2abaa03b 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.10 2019/08/10 18:15:52 jsing Exp $ */ | 1 | /* $OpenBSD: cms_err.c,v 1.11 2019/08/11 14:18:38 jsing Exp $ */ |
2 | /* | 2 | /* |
3 | * Generated by util/mkerr.pl DO NOT EDIT | 3 | * Generated by util/mkerr.pl DO NOT EDIT |
4 | * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. | 4 | * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. |
@@ -14,7 +14,7 @@ | |||
14 | 14 | ||
15 | #ifndef OPENSSL_NO_ERR | 15 | #ifndef OPENSSL_NO_ERR |
16 | 16 | ||
17 | static const ERR_STRING_DATA CMS_str_functs[] = { | 17 | static ERR_STRING_DATA CMS_str_functs[] = { |
18 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CHECK_CONTENT, 0), "check_content"}, | 18 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CHECK_CONTENT, 0), "check_content"}, |
19 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_ADD0_CERT, 0), "CMS_add0_cert"}, | 19 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_ADD0_CERT, 0), "CMS_add0_cert"}, |
20 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_ADD0_RECIPIENT_KEY, 0), | 20 | {ERR_PACK(ERR_LIB_CMS, CMS_F_CMS_ADD0_RECIPIENT_KEY, 0), |
@@ -154,7 +154,7 @@ static const ERR_STRING_DATA CMS_str_functs[] = { | |||
154 | {0, NULL} | 154 | {0, NULL} |
155 | }; | 155 | }; |
156 | 156 | ||
157 | static const ERR_STRING_DATA CMS_str_reasons[] = { | 157 | static ERR_STRING_DATA CMS_str_reasons[] = { |
158 | {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_ADD_SIGNER_ERROR), "add signer error"}, | 158 | {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_ADD_SIGNER_ERROR), "add signer error"}, |
159 | {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CERTIFICATE_ALREADY_PRESENT), | 159 | {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CERTIFICATE_ALREADY_PRESENT), |
160 | "certificate already present"}, | 160 | "certificate already present"}, |
@@ -288,8 +288,8 @@ ERR_load_CMS_strings(void) | |||
288 | { | 288 | { |
289 | #ifndef OPENSSL_NO_ERR | 289 | #ifndef OPENSSL_NO_ERR |
290 | if (ERR_func_error_string(CMS_str_functs[0].error) == NULL) { | 290 | if (ERR_func_error_string(CMS_str_functs[0].error) == NULL) { |
291 | ERR_load_strings_const(CMS_str_functs); | 291 | ERR_load_strings(ERR_LIB_CMS, CMS_str_functs); |
292 | ERR_load_strings_const(CMS_str_reasons); | 292 | ERR_load_strings(ERR_LIB_CMS, CMS_str_reasons); |
293 | } | 293 | } |
294 | #endif | 294 | #endif |
295 | return 1; | 295 | return 1; |