From: Darren Tucker <dtucker@dtucker.net>
Date: Mon, 27 Mar 2023 23:35:18 +0000 (+1100)
Subject: Replace OPENSSL_NO_SHA with HEADER_SHA_H.
X-Git-Tag: V_9_4_P1~119
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=72bd68d37387aa5f81da928f6e82f1c88ed8f674;p=thirdparty%2Fopenssh-portable.git

Replace OPENSSL_NO_SHA with HEADER_SHA_H.

Since this test doesn't use OpenSSL's SHA2 and may cause conflicts we
don't want to include it, but OPENSSL_NO_SHA was removed beginning in
OpenSSL's 1.1 series.
---

diff --git a/regress/misc/sk-dummy/sk-dummy.c b/regress/misc/sk-dummy/sk-dummy.c
index ad5e47452..0972cebf5 100644
--- a/regress/misc/sk-dummy/sk-dummy.c
+++ b/regress/misc/sk-dummy/sk-dummy.c
@@ -37,7 +37,7 @@
 
 #ifdef WITH_OPENSSL
 /* We don't use sha2 from OpenSSL and they can conflict with system sha2.h */
-#define OPENSSL_NO_SHA
+#define HEADER_SHA_H
 #define USE_LIBC_SHA2	/* NetBSD 9 */
 #include <openssl/opensslv.h>
 #include <openssl/crypto.h>