From b76fd1ccd44628ef71b0f6c895c03bf218621690 Mon Sep 17 00:00:00 2001 From: tb Date: Sun, 25 Jun 2023 19:14:14 +0000 Subject: [PATCH] Move the ecdh_method struct declaration to ech_lib.c No other file uses this anymore --- lib/libcrypto/ecdh/ech_lib.c | 11 +++++++++-- lib/libcrypto/ecdh/ech_local.h | 10 +--------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/lib/libcrypto/ecdh/ech_lib.c b/lib/libcrypto/ecdh/ech_lib.c index d9687932081..c537ba00bf8 100644 --- a/lib/libcrypto/ecdh/ech_lib.c +++ b/lib/libcrypto/ecdh/ech_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ech_lib.c,v 1.20 2023/06/25 19:04:35 tb Exp $ */ +/* $OpenBSD: ech_lib.c,v 1.21 2023/06/25 19:14:14 tb Exp $ */ /* ==================================================================== * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED. * @@ -77,7 +77,14 @@ #include #include "ec_local.h" -#include "ech_local.h" + +struct ecdh_method { + const char *name; + int (*compute_key)(void *key, size_t outlen, const EC_POINT *pub_key, EC_KEY *ecdh, + void *(*KDF)(const void *in, size_t inlen, void *out, size_t *outlen)); + int flags; + char *app_data; +}; static const ECDH_METHOD *default_ECDH_method = NULL; diff --git a/lib/libcrypto/ecdh/ech_local.h b/lib/libcrypto/ecdh/ech_local.h index fefa817b1cb..44aa2cf2502 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.4 2023/06/25 18:45:56 tb Exp $ */ +/* $OpenBSD: ech_local.h,v 1.5 2023/06/25 19:14:14 tb Exp $ */ /* ==================================================================== * Copyright (c) 2000-2005 The OpenSSL Project. All rights reserved. * @@ -60,14 +60,6 @@ __BEGIN_HIDDEN_DECLS -struct ecdh_method { - const char *name; - int (*compute_key)(void *key, size_t outlen, const EC_POINT *pub_key, EC_KEY *ecdh, - void *(*KDF)(const void *in, size_t inlen, void *out, size_t *outlen)); - int flags; - char *app_data; -}; - /* * ECDH Key Derivation Function as defined in ANSI X9.63. */ -- 2.20.1