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/engine/engine.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/lib/libcrypto/engine/engine.h') 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 #ifndef OPENSSL_NO_RSA #include @@ -92,7 +91,6 @@ #endif #include #include -#endif #include -- cgit v1.2.3-55-g6feb