From 0d79a0b0bbb8531e12ebaf2457df0aea4c12cb02 Mon Sep 17 00:00:00 2001
From: tb <>
Date: Tue, 18 Apr 2023 08:33:43 +0000
Subject: Move some includes out of OPENSSL_NO_DEPRECATED

Some headers were included conditionally on OPENSSL_NO_DEPRECATED in hopes
that eventually the mess of everything includes everything will magically
resolve itself. Of course everyone would end up building openssl with
OPENSSL_NO_DEPRECATED over time... Right.

Surprisingly, the ecosystem has come to rely on these implicit inclusions,
so about two dozen ports would fail to build because of this. Patching this
would be easy but really not worth the effort.

ok jsing
---
 src/lib/libcrypto/asn1/asn1.h     | 4 +---
 src/lib/libcrypto/dh/dh.h         | 4 +---
 src/lib/libcrypto/dsa/dsa.h       | 4 +---
 src/lib/libcrypto/ecdh/ecdh.h     | 4 +---
 src/lib/libcrypto/ecdsa/ecdsa.h   | 4 +---
 src/lib/libcrypto/engine/engine.h | 4 +---
 src/lib/libcrypto/rsa/rsa.h       | 4 +---
 src/lib/libcrypto/ui/ui.h         | 4 +---
 src/lib/libcrypto/x509/x509.h     | 4 +---
 9 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/src/lib/libcrypto/asn1/asn1.h b/src/lib/libcrypto/asn1/asn1.h
index fc1d4be02b..01bfcd31e0 100644
--- a/src/lib/libcrypto/asn1/asn1.h
+++ b/src/lib/libcrypto/asn1/asn1.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: asn1.h,v 1.72 2022/11/13 13:59:46 tb Exp $ */
+/* $OpenBSD: asn1.h,v 1.73 2023/04/18 08:33:43 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -70,9 +70,7 @@
 #include <openssl/safestack.h>
 
 #include <openssl/ossl_typ.h>
-#ifndef OPENSSL_NO_DEPRECATED
 #include <openssl/bn.h>
-#endif
 
 #ifdef  __cplusplus
 extern "C" {
diff --git a/src/lib/libcrypto/dh/dh.h b/src/lib/libcrypto/dh/dh.h
index 402ef6e17b..65b4348acf 100644
--- a/src/lib/libcrypto/dh/dh.h
+++ b/src/lib/libcrypto/dh/dh.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: dh.h,v 1.36 2023/04/09 19:10:23 tb Exp $ */
+/* $OpenBSD: dh.h,v 1.37 2023/04/18 08:33:43 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -69,9 +69,7 @@
 #include <openssl/bio.h>
 #endif
 #include <openssl/ossl_typ.h>
-#ifndef OPENSSL_NO_DEPRECATED
 #include <openssl/bn.h>
-#endif
 
 #ifndef OPENSSL_DH_MAX_MODULUS_BITS
 # define OPENSSL_DH_MAX_MODULUS_BITS	10000
diff --git a/src/lib/libcrypto/dsa/dsa.h b/src/lib/libcrypto/dsa/dsa.h
index c1ff3d7de7..3d81dc6dec 100644
--- a/src/lib/libcrypto/dsa/dsa.h
+++ b/src/lib/libcrypto/dsa/dsa.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: dsa.h,v 1.41 2023/04/09 19:10:23 tb Exp $ */
+/* $OpenBSD: dsa.h,v 1.42 2023/04/18 08:33:43 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -77,12 +77,10 @@
 #include <openssl/crypto.h>
 #include <openssl/ossl_typ.h>
 
-#ifndef OPENSSL_NO_DEPRECATED
 #include <openssl/bn.h>
 #ifndef OPENSSL_NO_DH
 # include <openssl/dh.h>
 #endif
-#endif
 
 #ifndef OPENSSL_DSA_MAX_MODULUS_BITS
 # define OPENSSL_DSA_MAX_MODULUS_BITS	10000
diff --git a/src/lib/libcrypto/ecdh/ecdh.h b/src/lib/libcrypto/ecdh/ecdh.h
index b39a90f165..98cc2223a1 100644
--- a/src/lib/libcrypto/ecdh/ecdh.h
+++ b/src/lib/libcrypto/ecdh/ecdh.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ecdh.h,v 1.6 2022/07/12 14:42:49 kn Exp $ */
+/* $OpenBSD: ecdh.h,v 1.7 2023/04/18 08:33:43 tb Exp $ */
 /* ====================================================================
  * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
  *
@@ -77,9 +77,7 @@
 
 #include <openssl/ec.h>
 #include <openssl/ossl_typ.h>
-#ifndef OPENSSL_NO_DEPRECATED
 #include <openssl/bn.h>
-#endif
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/lib/libcrypto/ecdsa/ecdsa.h b/src/lib/libcrypto/ecdsa/ecdsa.h
index 3f0eb3b66f..d095ef40a3 100644
--- a/src/lib/libcrypto/ecdsa/ecdsa.h
+++ b/src/lib/libcrypto/ecdsa/ecdsa.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ecdsa.h,v 1.13 2022/12/26 07:18:51 jmc Exp $ */
+/* $OpenBSD: ecdsa.h,v 1.14 2023/04/18 08:33:43 tb Exp $ */
 /**
  * \file   crypto/ecdsa/ecdsa.h Include file for the OpenSSL ECDSA functions
  * \author Written by Nils Larsch for the OpenSSL project
@@ -67,9 +67,7 @@
 
 #include <openssl/ec.h>
 #include <openssl/ossl_typ.h>
-#ifndef OPENSSL_NO_DEPRECATED
 #include <openssl/bn.h>
-#endif
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/lib/libcrypto/engine/engine.h b/src/lib/libcrypto/engine/engine.h
index 41f05d48af..8a3574fd57 100644
--- a/src/lib/libcrypto/engine/engine.h
+++ b/src/lib/libcrypto/engine/engine.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: engine.h,v 1.35 2022/12/26 07:18:52 jmc Exp $ */
+/* $OpenBSD: engine.h,v 1.36 2023/04/18 08:33:43 tb Exp $ */
 /* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL
  * project 2000.
  */
@@ -70,7 +70,6 @@
 #error ENGINE is disabled.
 #endif
 
-#ifndef OPENSSL_NO_DEPRECATED
 #include <openssl/bn.h>
 #ifndef OPENSSL_NO_RSA
 #include <openssl/rsa.h>
@@ -92,7 +91,6 @@
 #endif
 #include <openssl/ui.h>
 #include <openssl/err.h>
-#endif
 
 #include <openssl/ossl_typ.h>
 
diff --git a/src/lib/libcrypto/rsa/rsa.h b/src/lib/libcrypto/rsa/rsa.h
index 3ee2afd627..bf0aac647e 100644
--- a/src/lib/libcrypto/rsa/rsa.h
+++ b/src/lib/libcrypto/rsa/rsa.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: rsa.h,v 1.60 2023/04/15 18:44:17 tb Exp $ */
+/* $OpenBSD: rsa.h,v 1.61 2023/04/18 08:33:43 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -68,9 +68,7 @@
 #endif
 #include <openssl/crypto.h>
 #include <openssl/ossl_typ.h>
-#ifndef OPENSSL_NO_DEPRECATED
 #include <openssl/bn.h>
-#endif
 
 #ifdef OPENSSL_NO_RSA
 #error RSA is disabled.
diff --git a/src/lib/libcrypto/ui/ui.h b/src/lib/libcrypto/ui/ui.h
index 79d807f03c..c688431394 100644
--- a/src/lib/libcrypto/ui/ui.h
+++ b/src/lib/libcrypto/ui/ui.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ui.h,v 1.17 2023/03/10 16:41:32 tb Exp $ */
+/* $OpenBSD: ui.h,v 1.18 2023/04/18 08:33:43 tb Exp $ */
 /* Written by Richard Levitte (richard@levitte.org) for the OpenSSL
  * project 2001.
  */
@@ -61,9 +61,7 @@
 
 #include <openssl/opensslconf.h>
 
-#ifndef OPENSSL_NO_DEPRECATED
 #include <openssl/crypto.h>
-#endif
 #include <openssl/safestack.h>
 #include <openssl/ossl_typ.h>
 
diff --git a/src/lib/libcrypto/x509/x509.h b/src/lib/libcrypto/x509/x509.h
index 7862307571..ac14dd3868 100644
--- a/src/lib/libcrypto/x509/x509.h
+++ b/src/lib/libcrypto/x509/x509.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: x509.h,v 1.94 2023/03/10 16:43:02 tb Exp $ */
+/* $OpenBSD: x509.h,v 1.95 2023/04/18 08:33:43 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -91,7 +91,6 @@
 #include <openssl/ecdh.h>
 #endif
 
-#ifndef OPENSSL_NO_DEPRECATED
 #ifndef OPENSSL_NO_RSA
 #include <openssl/rsa.h>
 #endif
@@ -101,7 +100,6 @@
 #ifndef OPENSSL_NO_DH
 #include <openssl/dh.h>
 #endif
-#endif
 
 #ifndef OPENSSL_NO_SHA
 #include <openssl/sha.h>
-- 
cgit v1.2.3-55-g6feb