summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortb <>2023-08-11 04:52:08 +0000
committertb <>2023-08-11 04:52:08 +0000
commit462d7f977b8b8246275ae460e624e0846967e51c (patch)
tree4d8a861f979442d82157bd13de09981b6841d4d2
parent8606a65ff8cf7df8afe3c513ae0d757a78832656 (diff)
downloadopenbsd-462d7f977b8b8246275ae460e624e0846967e51c.tar.gz
openbsd-462d7f977b8b8246275ae460e624e0846967e51c.tar.bz2
openbsd-462d7f977b8b8246275ae460e624e0846967e51c.zip
Use EVP_MD in HKDF() and HKDF_extract() prototypes
Switch these prototypes to be like all other code and use the EVP_MD type rather than the internal name of the struct. This also makes the function definitions match the prototypes. ok jsing
-rw-r--r--src/lib/libcrypto/hkdf/hkdf.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/libcrypto/hkdf/hkdf.h b/src/lib/libcrypto/hkdf/hkdf.h
index 34450f9dd7..6cec526e3e 100644
--- a/src/lib/libcrypto/hkdf/hkdf.h
+++ b/src/lib/libcrypto/hkdf/hkdf.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: hkdf.h,v 1.2 2018/04/03 13:33:53 tb Exp $ */ 1/* $OpenBSD: hkdf.h,v 1.3 2023/08/11 04:52:08 tb Exp $ */
2/* Copyright (c) 2014, Google Inc. 2/* Copyright (c) 2014, Google Inc.
3 * 3 *
4 * Permission to use, copy, modify, and/or distribute this software for any 4 * Permission to use, copy, modify, and/or distribute this software for any
@@ -33,7 +33,7 @@ extern "C" {
33 * a key from a password. 33 * a key from a password.
34 */ 34 */
35 35
36int HKDF(uint8_t *out_key, size_t out_len, const struct env_md_st *digest, 36int HKDF(uint8_t *out_key, size_t out_len, const EVP_MD *digest,
37 const uint8_t *secret, size_t secret_len, const uint8_t *salt, 37 const uint8_t *secret, size_t secret_len, const uint8_t *salt,
38 size_t salt_len, const uint8_t *info, size_t info_len); 38 size_t salt_len, const uint8_t *info, size_t info_len);
39 39
@@ -43,9 +43,9 @@ int HKDF(uint8_t *out_key, size_t out_len, const struct env_md_st *digest,
43 * and outputs |out_len| bytes to |out_key|. The maximum output size 43 * and outputs |out_len| bytes to |out_key|. The maximum output size
44 * is |EVP_MAX_MD_SIZE|. It returns one on success and zero on error. 44 * is |EVP_MAX_MD_SIZE|. It returns one on success and zero on error.
45 */ 45 */
46int HKDF_extract(uint8_t *out_key, size_t *out_len, 46int HKDF_extract(uint8_t *out_key, size_t *out_len, const EVP_MD *digest,
47 const struct env_md_st *digest, const uint8_t *secret, 47 const uint8_t *secret, size_t secret_len,
48 size_t secret_len, const uint8_t *salt, size_t salt_len); 48 const uint8_t *salt, size_t salt_len);
49 49
50/* 50/*
51 * HKDF_expand computes a HKDF OKM (as specified by RFC 5869) of 51 * HKDF_expand computes a HKDF OKM (as specified by RFC 5869) of