diff options
Diffstat (limited to 'src/lib/libcrypto/kdf')
| -rw-r--r-- | src/lib/libcrypto/kdf/kdf_err.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/lib/libcrypto/kdf/kdf_err.c b/src/lib/libcrypto/kdf/kdf_err.c index 4dd323701a..fc38e08136 100644 --- a/src/lib/libcrypto/kdf/kdf_err.c +++ b/src/lib/libcrypto/kdf/kdf_err.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: kdf_err.c,v 1.9 2022/07/12 14:42:49 kn Exp $ */ | 1 | /* $OpenBSD: kdf_err.c,v 1.10 2024/06/24 06:43:22 tb Exp $ */ |
| 2 | /* ==================================================================== | 2 | /* ==================================================================== |
| 3 | * Copyright (c) 1999-2018 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 1999-2018 The OpenSSL Project. All rights reserved. |
| 4 | * | 4 | * |
| @@ -56,16 +56,18 @@ | |||
| 56 | #include <openssl/err.h> | 56 | #include <openssl/err.h> |
| 57 | #include <openssl/kdf.h> | 57 | #include <openssl/kdf.h> |
| 58 | 58 | ||
| 59 | #include "err_local.h" | ||
| 60 | |||
| 59 | #ifndef OPENSSL_NO_ERR | 61 | #ifndef OPENSSL_NO_ERR |
| 60 | 62 | ||
| 61 | static ERR_STRING_DATA KDF_str_functs[] = { | 63 | static const ERR_STRING_DATA KDF_str_functs[] = { |
| 62 | {ERR_PACK(ERR_LIB_KDF, KDF_F_PKEY_HKDF_CTRL_STR, 0), "pkey_hkdf_ctrl_str"}, | 64 | {ERR_PACK(ERR_LIB_KDF, KDF_F_PKEY_HKDF_CTRL_STR, 0), "pkey_hkdf_ctrl_str"}, |
| 63 | {ERR_PACK(ERR_LIB_KDF, KDF_F_PKEY_HKDF_DERIVE, 0), "pkey_hkdf_derive"}, | 65 | {ERR_PACK(ERR_LIB_KDF, KDF_F_PKEY_HKDF_DERIVE, 0), "pkey_hkdf_derive"}, |
| 64 | {ERR_PACK(ERR_LIB_KDF, KDF_F_PKEY_HKDF_INIT, 0), "pkey_hkdf_init"}, | 66 | {ERR_PACK(ERR_LIB_KDF, KDF_F_PKEY_HKDF_INIT, 0), "pkey_hkdf_init"}, |
| 65 | {0, NULL}, | 67 | {0, NULL}, |
| 66 | }; | 68 | }; |
| 67 | 69 | ||
| 68 | static ERR_STRING_DATA KDF_str_reasons[] = { | 70 | static const ERR_STRING_DATA KDF_str_reasons[] = { |
| 69 | {ERR_PACK(ERR_LIB_KDF, 0, KDF_R_MISSING_KEY), "missing key"}, | 71 | {ERR_PACK(ERR_LIB_KDF, 0, KDF_R_MISSING_KEY), "missing key"}, |
| 70 | {ERR_PACK(ERR_LIB_KDF, 0, KDF_R_MISSING_MESSAGE_DIGEST), | 72 | {ERR_PACK(ERR_LIB_KDF, 0, KDF_R_MISSING_MESSAGE_DIGEST), |
| 71 | "missing message digest"}, | 73 | "missing message digest"}, |
| @@ -81,8 +83,8 @@ ERR_load_KDF_strings(void) | |||
| 81 | { | 83 | { |
| 82 | #ifndef OPENSSL_NO_ERR | 84 | #ifndef OPENSSL_NO_ERR |
| 83 | if (ERR_func_error_string(KDF_str_functs[0].error) == NULL) { | 85 | if (ERR_func_error_string(KDF_str_functs[0].error) == NULL) { |
| 84 | ERR_load_strings(0, KDF_str_functs); | 86 | ERR_load_const_strings(KDF_str_functs); |
| 85 | ERR_load_strings(0, KDF_str_reasons); | 87 | ERR_load_const_strings(KDF_str_reasons); |
| 86 | } | 88 | } |
| 87 | #endif | 89 | #endif |
| 88 | return 1; | 90 | return 1; |
