diff options
author | tb <> | 2022-05-05 08:10:39 +0000 |
---|---|---|
committer | tb <> | 2022-05-05 08:10:39 +0000 |
commit | 814afe4b90a7c4ffcfd25c1cea43f87cd35aef58 (patch) | |
tree | d3406758dd4c41828304264b01b0e8ea4d8cd644 /src/lib | |
parent | 37c1991ceacf34bfd692799be9a693b0eecec971 (diff) | |
download | openbsd-814afe4b90a7c4ffcfd25c1cea43f87cd35aef58.tar.gz openbsd-814afe4b90a7c4ffcfd25c1cea43f87cd35aef58.tar.bz2 openbsd-814afe4b90a7c4ffcfd25c1cea43f87cd35aef58.zip |
Remove function codes from errors, i.e., KDFerr(A, B) -> KDFerror(B)
ok beck jsing
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/libcrypto/kdf/hkdf_evp.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/libcrypto/kdf/hkdf_evp.c b/src/lib/libcrypto/kdf/hkdf_evp.c index 2501ba9cfa..37cdd92ba6 100644 --- a/src/lib/libcrypto/kdf/hkdf_evp.c +++ b/src/lib/libcrypto/kdf/hkdf_evp.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: hkdf_evp.c,v 1.12 2022/05/05 08:07:24 tb Exp $ */ | 1 | /* $OpenBSD: hkdf_evp.c,v 1.13 2022/05/05 08:10:39 tb Exp $ */ |
2 | /* ==================================================================== | 2 | /* ==================================================================== |
3 | * Copyright (c) 2016-2018 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 2016-2018 The OpenSSL Project. All rights reserved. |
4 | * | 4 | * |
@@ -77,7 +77,7 @@ pkey_hkdf_init(EVP_PKEY_CTX *ctx) | |||
77 | HKDF_PKEY_CTX *kctx; | 77 | HKDF_PKEY_CTX *kctx; |
78 | 78 | ||
79 | if ((kctx = calloc(1, sizeof(*kctx))) == NULL) { | 79 | if ((kctx = calloc(1, sizeof(*kctx))) == NULL) { |
80 | KDFerr(KDF_F_PKEY_HKDF_INIT, ERR_R_MALLOC_FAILURE); | 80 | KDFerror(ERR_R_MALLOC_FAILURE); |
81 | return 0; | 81 | return 0; |
82 | } | 82 | } |
83 | 83 | ||
@@ -208,7 +208,7 @@ pkey_hkdf_ctrl_str(EVP_PKEY_CTX *ctx, const char *type, | |||
208 | return EVP_PKEY_CTX_hex2ctrl(ctx, EVP_PKEY_CTRL_HKDF_INFO, | 208 | return EVP_PKEY_CTX_hex2ctrl(ctx, EVP_PKEY_CTRL_HKDF_INFO, |
209 | value); | 209 | value); |
210 | 210 | ||
211 | KDFerr(KDF_F_PKEY_HKDF_CTRL_STR, KDF_R_UNKNOWN_PARAMETER_TYPE); | 211 | KDFerror(KDF_R_UNKNOWN_PARAMETER_TYPE); |
212 | return -2; | 212 | return -2; |
213 | } | 213 | } |
214 | 214 | ||
@@ -232,11 +232,11 @@ pkey_hkdf_derive(EVP_PKEY_CTX *ctx, unsigned char *key, | |||
232 | HKDF_PKEY_CTX *kctx = ctx->data; | 232 | HKDF_PKEY_CTX *kctx = ctx->data; |
233 | 233 | ||
234 | if (kctx->md == NULL) { | 234 | if (kctx->md == NULL) { |
235 | KDFerr(KDF_F_PKEY_HKDF_DERIVE, KDF_R_MISSING_MESSAGE_DIGEST); | 235 | KDFerror(KDF_R_MISSING_MESSAGE_DIGEST); |
236 | return 0; | 236 | return 0; |
237 | } | 237 | } |
238 | if (kctx->key == NULL) { | 238 | if (kctx->key == NULL) { |
239 | KDFerr(KDF_F_PKEY_HKDF_DERIVE, KDF_R_MISSING_KEY); | 239 | KDFerror(KDF_R_MISSING_KEY); |
240 | return 0; | 240 | return 0; |
241 | } | 241 | } |
242 | 242 | ||