diff options
author | Theo Buehler <tb@cvs.openbsd.org> | 2023-06-25 19:20:58 +0000 |
---|---|---|
committer | Theo Buehler <tb@cvs.openbsd.org> | 2023-06-25 19:20:58 +0000 |
commit | 39643c73f2792d4c7f280b07626cb33c2a94d546 (patch) | |
tree | b09996eb2939b9c0d30c547db31ed09b943b83bb | |
parent | 3a2a2ca866693b861fa3a4618822fd25e0a66699 (diff) |
Move ecdh_KDF_X9_63() to ec_local.h
In anticipation of merging ecdh/ and ecdsa/ into ec/, move the last
remaining thing in ech_local.h where it will soon belong.
-rw-r--r-- | lib/libcrypto/ec/ec_local.h | 8 | ||||
-rw-r--r-- | lib/libcrypto/ecdh/ech_local.h | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/lib/libcrypto/ec/ec_local.h b/lib/libcrypto/ec/ec_local.h index 6913cb5683c..84e20375c28 100644 --- a/lib/libcrypto/ec/ec_local.h +++ b/lib/libcrypto/ec/ec_local.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ec_local.h,v 1.19 2023/06/25 18:52:27 tb Exp $ */ +/* $OpenBSD: ec_local.h,v 1.20 2023/06/25 19:20:57 tb Exp $ */ /* * Originally written by Bodo Moeller for the OpenSSL project. */ @@ -362,6 +362,12 @@ int ossl_ecdsa_verify(int type, const unsigned char *dgst, int dgst_len, int ossl_ecdsa_verify_sig(const unsigned char *dgst, int dgst_len, const ECDSA_SIG *sig, EC_KEY *eckey); +/* + * ECDH Key Derivation Function as defined in ANSI X9.63. + */ +int ecdh_KDF_X9_63(unsigned char *out, size_t outlen, const unsigned char *Z, + size_t Zlen, const unsigned char *sinfo, size_t sinfolen, const EVP_MD *md); + void *EC_KEY_get_key_method_data(EC_KEY *key, void *(*dup_func)(void *), void (*free_func)(void *), void (*clear_free_func)(void *)); diff --git a/lib/libcrypto/ecdh/ech_local.h b/lib/libcrypto/ecdh/ech_local.h index 44aa2cf2502..7e2dfd8c43b 100644 --- a/lib/libcrypto/ecdh/ech_local.h +++ b/lib/libcrypto/ecdh/ech_local.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ech_local.h,v 1.5 2023/06/25 19:14:14 tb Exp $ */ +/* $OpenBSD: ech_local.h,v 1.6 2023/06/25 19:20:57 tb Exp $ */ /* ==================================================================== * Copyright (c) 2000-2005 The OpenSSL Project. All rights reserved. * @@ -60,12 +60,6 @@ __BEGIN_HIDDEN_DECLS -/* - * ECDH Key Derivation Function as defined in ANSI X9.63. - */ -int ecdh_KDF_X9_63(unsigned char *out, size_t outlen, const unsigned char *Z, - size_t Zlen, const unsigned char *sinfo, size_t sinfolen, const EVP_MD *md); - __END_HIDDEN_DECLS #endif /* !HEADER_ECH_LOCAL_H */ |