From: Kenjiro Nakayama <nakayamakenjiro@gmail.com>
Subject: [PATCH] libressl: Clean up OPENSSL_NO_xxx
To: tech@openbsd.org
Cc: Kenjiro Nakayama <nakayamakenjiro@gmail.com>
Date: Wed, 26 Feb 2025 17:52:19 +0900

This patch removes unnecessary OPENSS_NO_xxx such as OPENSSL_NO_LHASH,
OPENSSL_NO_STACK and OPENSSL_NO_X509.

Signed-off-by: Kenjiro Nakayama <nakayamakenjiro@gmail.com>
---
 src/lib/libcrypto/err/err.h       | 3 ---
 src/lib/libcrypto/pem/pem.h       | 3 ---
 src/lib/libcrypto/x509/x509_vfy.h | 3 ---
 src/lib/libssl/ssl.h              | 3 ---
 4 files changed, 12 deletions(-)

diff --git a/src/lib/libcrypto/err/err.h b/src/lib/libcrypto/err/err.h
index 66bd54dee..d16903657 100644
--- a/src/lib/libcrypto/err/err.h
+++ b/src/lib/libcrypto/err/err.h
@@ -121,9 +121,6 @@
 #ifndef OPENSSL_NO_BIO
 #include <openssl/bio.h>
 #endif
-#ifndef OPENSSL_NO_LHASH
-#include <openssl/lhash.h>
-#endif
 
 #ifdef	__cplusplus
 extern "C" {
diff --git a/src/lib/libcrypto/pem/pem.h b/src/lib/libcrypto/pem/pem.h
index 4fdab48bb..7f8e8d494 100644
--- a/src/lib/libcrypto/pem/pem.h
+++ b/src/lib/libcrypto/pem/pem.h
@@ -64,9 +64,6 @@
 #ifndef OPENSSL_NO_BIO
 #include <openssl/bio.h>
 #endif
-#ifndef OPENSSL_NO_STACK
-#include <openssl/stack.h>
-#endif
 #include <openssl/evp.h>
 #include <openssl/x509.h>
 
diff --git a/src/lib/libcrypto/x509/x509_vfy.h b/src/lib/libcrypto/x509/x509_vfy.h
index 43b94021b..cc4c2d422 100644
--- a/src/lib/libcrypto/x509/x509_vfy.h
+++ b/src/lib/libcrypto/x509/x509_vfy.h
@@ -67,9 +67,6 @@
 
 #include <openssl/opensslconf.h>
 
-#ifndef OPENSSL_NO_LHASH
-#include <openssl/lhash.h>
-#endif
 #include <openssl/bio.h>
 #include <openssl/crypto.h>
 
diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h
index 650131a77..48e72def6 100644
--- a/src/lib/libssl/ssl.h
+++ b/src/lib/libssl/ssl.h
@@ -158,9 +158,6 @@
 #include <openssl/crypto.h>
 #include <openssl/lhash.h>
 
-#ifndef OPENSSL_NO_X509
-#include <openssl/x509.h>
-#endif
 #endif
 
 #ifdef  __cplusplus
-- 
2.39.5 (Apple Git-154)