diff options
| author | tb <> | 2023-06-25 19:20:57 +0000 |
|---|---|---|
| committer | tb <> | 2023-06-25 19:20:57 +0000 |
| commit | f77c305e7c999d3d629c8ad6a7c969cbad04bbbb (patch) | |
| tree | 63cec961bbe4cb316a70ca91187d35cec28ed567 /src/lib | |
| parent | 62f8cce22ec5250bff3d4aaa540494f06de9d7a6 (diff) | |
| download | openbsd-f77c305e7c999d3d629c8ad6a7c969cbad04bbbb.tar.gz openbsd-f77c305e7c999d3d629c8ad6a7c969cbad04bbbb.tar.bz2 openbsd-f77c305e7c999d3d629c8ad6a7c969cbad04bbbb.zip | |
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.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/libcrypto/ec/ec_local.h | 8 | ||||
| -rw-r--r-- | src/lib/libcrypto/ecdh/ech_local.h | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/libcrypto/ec/ec_local.h b/src/lib/libcrypto/ec/ec_local.h index 6913cb5683..84e20375c2 100644 --- a/src/lib/libcrypto/ec/ec_local.h +++ b/src/lib/libcrypto/ec/ec_local.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ec_local.h,v 1.19 2023/06/25 18:52:27 tb Exp $ */ | 1 | /* $OpenBSD: ec_local.h,v 1.20 2023/06/25 19:20:57 tb Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Originally written by Bodo Moeller for the OpenSSL project. | 3 | * Originally written by Bodo Moeller for the OpenSSL project. |
| 4 | */ | 4 | */ |
| @@ -362,6 +362,12 @@ int ossl_ecdsa_verify(int type, const unsigned char *dgst, int dgst_len, | |||
| 362 | int ossl_ecdsa_verify_sig(const unsigned char *dgst, int dgst_len, | 362 | int ossl_ecdsa_verify_sig(const unsigned char *dgst, int dgst_len, |
| 363 | const ECDSA_SIG *sig, EC_KEY *eckey); | 363 | const ECDSA_SIG *sig, EC_KEY *eckey); |
| 364 | 364 | ||
| 365 | /* | ||
| 366 | * ECDH Key Derivation Function as defined in ANSI X9.63. | ||
| 367 | */ | ||
| 368 | int ecdh_KDF_X9_63(unsigned char *out, size_t outlen, const unsigned char *Z, | ||
| 369 | size_t Zlen, const unsigned char *sinfo, size_t sinfolen, const EVP_MD *md); | ||
| 370 | |||
| 365 | void *EC_KEY_get_key_method_data(EC_KEY *key, | 371 | void *EC_KEY_get_key_method_data(EC_KEY *key, |
| 366 | void *(*dup_func)(void *), void (*free_func)(void *), | 372 | void *(*dup_func)(void *), void (*free_func)(void *), |
| 367 | void (*clear_free_func)(void *)); | 373 | void (*clear_free_func)(void *)); |
diff --git a/src/lib/libcrypto/ecdh/ech_local.h b/src/lib/libcrypto/ecdh/ech_local.h index 44aa2cf250..7e2dfd8c43 100644 --- a/src/lib/libcrypto/ecdh/ech_local.h +++ b/src/lib/libcrypto/ecdh/ech_local.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ech_local.h,v 1.5 2023/06/25 19:14:14 tb Exp $ */ | 1 | /* $OpenBSD: ech_local.h,v 1.6 2023/06/25 19:20:57 tb Exp $ */ |
| 2 | /* ==================================================================== | 2 | /* ==================================================================== |
| 3 | * Copyright (c) 2000-2005 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 2000-2005 The OpenSSL Project. All rights reserved. |
| 4 | * | 4 | * |
| @@ -60,12 +60,6 @@ | |||
| 60 | 60 | ||
| 61 | __BEGIN_HIDDEN_DECLS | 61 | __BEGIN_HIDDEN_DECLS |
| 62 | 62 | ||
| 63 | /* | ||
| 64 | * ECDH Key Derivation Function as defined in ANSI X9.63. | ||
| 65 | */ | ||
| 66 | int ecdh_KDF_X9_63(unsigned char *out, size_t outlen, const unsigned char *Z, | ||
| 67 | size_t Zlen, const unsigned char *sinfo, size_t sinfolen, const EVP_MD *md); | ||
| 68 | |||
| 69 | __END_HIDDEN_DECLS | 63 | __END_HIDDEN_DECLS |
| 70 | 64 | ||
| 71 | #endif /* !HEADER_ECH_LOCAL_H */ | 65 | #endif /* !HEADER_ECH_LOCAL_H */ |