summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortb <>2022-05-05 11:26:36 +0000
committertb <>2022-05-05 11:26:36 +0000
commit84103403c54ab18df3b04c64b3d2007b5664ad62 (patch)
tree1e068f646339562a2ec2af3225af90bdaf5cc1d4
parent35656f0007add79ff6e85e878a6119f645edef25 (diff)
downloadopenbsd-84103403c54ab18df3b04c64b3d2007b5664ad62.tar.gz
openbsd-84103403c54ab18df3b04c64b3d2007b5664ad62.tar.bz2
openbsd-84103403c54ab18df3b04c64b3d2007b5664ad62.zip
Fix argument order in HKDF and HKDF_extract().
Diffstat (limited to '')
-rw-r--r--src/lib/libcrypto/kdf/hkdf_evp.c10
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 36eae19e2b..a819e38081 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.14 2022/05/05 08:14:14 tb Exp $ */ 1/* $OpenBSD: hkdf_evp.c,v 1.15 2022/05/05 11:26:36 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 *
@@ -242,16 +242,16 @@ pkey_hkdf_derive(EVP_PKEY_CTX *ctx, unsigned char *key,
242 242
243 switch (kctx->mode) { 243 switch (kctx->mode) {
244 case EVP_PKEY_HKDEF_MODE_EXTRACT_AND_EXPAND: 244 case EVP_PKEY_HKDEF_MODE_EXTRACT_AND_EXPAND:
245 return HKDF(key, *keylen, kctx->md, kctx->salt, kctx->salt_len, 245 return HKDF(key, *keylen, kctx->md, kctx->key, kctx->key_len,
246 kctx->key, kctx->key_len, kctx->info, kctx->info_len); 246 kctx->salt, kctx->salt_len, kctx->info, kctx->info_len);
247 247
248 case EVP_PKEY_HKDEF_MODE_EXTRACT_ONLY: 248 case EVP_PKEY_HKDEF_MODE_EXTRACT_ONLY:
249 if (key == NULL) { 249 if (key == NULL) {
250 *keylen = EVP_MD_size(kctx->md); 250 *keylen = EVP_MD_size(kctx->md);
251 return 1; 251 return 1;
252 } 252 }
253 return HKDF_extract(key, keylen, kctx->md, kctx->salt, 253 return HKDF_extract(key, keylen, kctx->md, kctx->key,
254 kctx->salt_len, kctx->key, kctx->key_len); 254 kctx->key_len, kctx->salt, kctx->salt_len);
255 255
256 case EVP_PKEY_HKDEF_MODE_EXPAND_ONLY: 256 case EVP_PKEY_HKDEF_MODE_EXPAND_ONLY:
257 return HKDF_expand(key, *keylen, kctx->md, kctx->key, 257 return HKDF_expand(key, *keylen, kctx->md, kctx->key,