From: tb <tb@openbsd.org>
Date: Sun, 25 Jun 2023 19:26:04 +0000 (+0000)
Subject: Stop including ech_local.h
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=92280fad2f388a9c54ffd33d1e1591178bb458f0;p=openbsd

Stop including ech_local.h
---

diff --git a/lib/libcrypto/ec/ec_pmeth.c b/lib/libcrypto/ec/ec_pmeth.c
index d1bb52d9edc..7c94f80c7fe 100644
--- a/lib/libcrypto/ec/ec_pmeth.c
+++ b/lib/libcrypto/ec/ec_pmeth.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ec_pmeth.c,v 1.17 2023/04/25 15:48:48 tb Exp $ */
+/* $OpenBSD: ec_pmeth.c,v 1.18 2023/06/25 19:26:04 tb Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2006.
  */
@@ -68,7 +68,6 @@
 
 #include "bn_local.h"
 #include "ec_local.h"
-#include "ech_local.h"
 #include "evp_local.h"
 
 /* EC pkey context structure */
diff --git a/lib/libcrypto/ecdh/ecdh_kdf.c b/lib/libcrypto/ecdh/ecdh_kdf.c
index 5c22e9c8ea5..bcd718c47bf 100644
--- a/lib/libcrypto/ecdh/ecdh_kdf.c
+++ b/lib/libcrypto/ecdh/ecdh_kdf.c
@@ -52,10 +52,11 @@
 
 #include <string.h>
 
+#include <openssl/ecdh.h>
 #include <openssl/ec.h>
 #include <openssl/evp.h>
 
-#include "ech_local.h"
+#include "ec_local.h"
 
 /*
  * Key derivation function from X9.63/SECG.
diff --git a/lib/libcrypto/ecdh/ech_key.c b/lib/libcrypto/ecdh/ech_key.c
index 208a4b328e0..aa831f2b87c 100644
--- a/lib/libcrypto/ecdh/ech_key.c
+++ b/lib/libcrypto/ecdh/ech_key.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ech_key.c,v 1.17 2023/06/25 19:17:43 tb Exp $ */
+/* $OpenBSD: ech_key.c,v 1.18 2023/06/25 19:26:04 tb Exp $ */
 /* ====================================================================
  * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
  *
@@ -73,12 +73,12 @@
 #include <openssl/opensslconf.h>
 
 #include <openssl/bn.h>
+#include <openssl/ecdh.h>
 #include <openssl/err.h>
 #include <openssl/objects.h>
 #include <openssl/sha.h>
 
 #include "bn_local.h"
-#include "ech_local.h"
 #include "ec_local.h"
 
 /*