From 3e6ba5886cbe4cc72928d4b2589ebe61df798adc Mon Sep 17 00:00:00 2001
From: tb <tb@openbsd.org>
Date: Fri, 28 Jul 2023 15:50:33 +0000
Subject: [PATCH] Stop including ecdsa.h and ecdh.h internally

These headers are now reduced to #include <openssl/ec.h> and are provided
for compatiblity only. There's no point in using them. At the same time
garbage collect the last uses of OPENSSL_NO_{ECDSA,ECDH} in our tree.

ok jsing
---
 lib/libcrypto/ec/ec_local.h            | 3 +--
 lib/libcrypto/ec/ec_pmeth.c            | 3 +--
 lib/libcrypto/ecdsa/ecdsa_local.h      | 4 ++--
 lib/libcrypto/gost/gost_local.h        | 3 +--
 lib/libcrypto/gost/gostr341001_pmeth.c | 3 +--
 lib/libcrypto/sm2/sm2.h                | 3 +--
 lib/libcrypto/sm2/sm2_local.h          | 3 +--
 lib/libcrypto/x509/x509.h              | 8 +-------
 8 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/lib/libcrypto/ec/ec_local.h b/lib/libcrypto/ec/ec_local.h
index 8153d4a96a7..3252eeb1c83 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.25 2023/07/28 09:28:37 tb Exp $ */
+/* $OpenBSD: ec_local.h,v 1.26 2023/07/28 15:50:33 tb Exp $ */
 /*
  * Originally written by Bodo Moeller for the OpenSSL project.
  */
@@ -73,7 +73,6 @@
 
 #include <openssl/bn.h>
 #include <openssl/ec.h>
-#include <openssl/ecdsa.h>
 #include <openssl/objects.h>
 
 #include "bn_local.h"
diff --git a/lib/libcrypto/ec/ec_pmeth.c b/lib/libcrypto/ec/ec_pmeth.c
index 7c94f80c7fe..d3bf7e8cdca 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.18 2023/06/25 19:26:04 tb Exp $ */
+/* $OpenBSD: ec_pmeth.c,v 1.19 2023/07/28 15:50:33 tb Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2006.
  */
@@ -61,7 +61,6 @@
 
 #include <openssl/asn1t.h>
 #include <openssl/ec.h>
-#include <openssl/ecdsa.h>
 #include <openssl/err.h>
 #include <openssl/evp.h>
 #include <openssl/x509.h>
diff --git a/lib/libcrypto/ecdsa/ecdsa_local.h b/lib/libcrypto/ecdsa/ecdsa_local.h
index 249e0459006..cc3af3e10f7 100644
--- a/lib/libcrypto/ecdsa/ecdsa_local.h
+++ b/lib/libcrypto/ecdsa/ecdsa_local.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ecdsa_local.h,v 1.1 2023/07/05 11:37:46 tb Exp $ */
+/* $OpenBSD: ecdsa_local.h,v 1.2 2023/07/28 15:50:33 tb Exp $ */
 /*
  * Written by Nils Larsch for the OpenSSL project
  */
@@ -59,7 +59,7 @@
 #ifndef HEADER_ECS_LOCAL_H
 #define HEADER_ECS_LOCAL_H
 
-#include <openssl/ecdsa.h>
+#include <openssl/ec.h>
 
 __BEGIN_HIDDEN_DECLS
 
diff --git a/lib/libcrypto/gost/gost_local.h b/lib/libcrypto/gost/gost_local.h
index 830f14149e7..db07d06f04a 100644
--- a/lib/libcrypto/gost/gost_local.h
+++ b/lib/libcrypto/gost/gost_local.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: gost_local.h,v 1.2 2022/11/26 17:23:18 tb Exp $ */
+/* $OpenBSD: gost_local.h,v 1.3 2023/07/28 15:50:33 tb Exp $ */
 /*
  * Copyright (c) 2014 Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
  * Copyright (c) 2005-2006 Cryptocom LTD
@@ -53,7 +53,6 @@
 #define HEADER_GOST_LOCAL_H
 
 #include <openssl/ec.h>
-#include <openssl/ecdsa.h>
 
 __BEGIN_HIDDEN_DECLS
 
diff --git a/lib/libcrypto/gost/gostr341001_pmeth.c b/lib/libcrypto/gost/gostr341001_pmeth.c
index 93e4820d7c4..c5e05bec602 100644
--- a/lib/libcrypto/gost/gostr341001_pmeth.c
+++ b/lib/libcrypto/gost/gostr341001_pmeth.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gostr341001_pmeth.c,v 1.18 2023/07/05 11:37:45 tb Exp $ */
+/* $OpenBSD: gostr341001_pmeth.c,v 1.19 2023/07/28 15:50:33 tb Exp $ */
 /*
  * Copyright (c) 2014 Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
  * Copyright (c) 2005-2006 Cryptocom LTD
@@ -59,7 +59,6 @@
 #include <openssl/err.h>
 #include <openssl/gost.h>
 #include <openssl/ec.h>
-#include <openssl/ecdsa.h>
 #include <openssl/x509.h>
 
 #include "ecdsa_local.h"
diff --git a/lib/libcrypto/sm2/sm2.h b/lib/libcrypto/sm2/sm2.h
index dee75eb68b4..2f14fe666ea 100644
--- a/lib/libcrypto/sm2/sm2.h
+++ b/lib/libcrypto/sm2/sm2.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sm2.h,v 1.2 2022/07/12 14:42:50 kn Exp $ */
+/*	$OpenBSD: sm2.h,v 1.3 2023/07/28 15:50:33 tb Exp $ */
 /*
  * Copyright (c) 2017, 2019 Ribose Inc
  *
@@ -21,7 +21,6 @@
 #include <openssl/opensslconf.h>
 
 #include <openssl/ec.h>
-#include <openssl/ecdsa.h>
 
 #ifdef OPENSSL_NO_SM2
 #error SM2 is disabled.
diff --git a/lib/libcrypto/sm2/sm2_local.h b/lib/libcrypto/sm2/sm2_local.h
index ad97f2c7716..388c468ef24 100644
--- a/lib/libcrypto/sm2/sm2_local.h
+++ b/lib/libcrypto/sm2/sm2_local.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sm2_local.h,v 1.2 2022/11/26 17:23:18 tb Exp $ */
+/*	$OpenBSD: sm2_local.h,v 1.3 2023/07/28 15:50:33 tb Exp $ */
 /*
  * Copyright (c) 2017, 2019 Ribose Inc
  *
@@ -19,7 +19,6 @@
 #define HEADER_SM2_LOCAL_H
 
 #include <openssl/ec.h>
-#include <openssl/ecdsa.h>
 
 __BEGIN_HIDDEN_DECLS
 
diff --git a/lib/libcrypto/x509/x509.h b/lib/libcrypto/x509/x509.h
index c2a9dfedc5e..f76576f61c1 100644
--- a/lib/libcrypto/x509/x509.h
+++ b/lib/libcrypto/x509/x509.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: x509.h,v 1.100 2023/04/25 18:57:57 tb Exp $ */
+/* $OpenBSD: x509.h,v 1.101 2023/07/28 15:50:33 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -82,12 +82,6 @@
 #ifndef OPENSSL_NO_EC
 #include <openssl/ec.h>
 #endif
-#ifndef OPENSSL_NO_ECDSA
-#include <openssl/ecdsa.h>
-#endif
-#ifndef OPENSSL_NO_ECDH
-#include <openssl/ecdh.h>
-#endif
 #ifndef OPENSSL_NO_EVP
 #include <openssl/evp.h>
 #endif
-- 
2.20.1