From: Darren Tucker <dtucker@dtucker.net>
Date: Wed, 6 Oct 2021 04:40:58 +0000 (+1100)
Subject: Disable security key on NetBSD4 test.
X-Git-Tag: V_8_9_P1~238
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f4be526a338d06624f146fa26007bb9dd3a4f7b;p=thirdparty%2Fopenssh-portable.git

Disable security key on NetBSD4 test.

sk-dummy used for the security key test includes both sha2.h and OpenSSL
causing the definitions conflict so disable security key support on this
platform.
---

diff --git a/.github/configs b/.github/configs
index f28811c17..c2068f279 100755
--- a/.github/configs
+++ b/.github/configs
@@ -141,7 +141,8 @@ case "${TARGET_HOST}" in
 	;;
     nbsd4)
 	# System compiler will ICE on some files with fstack-protector
-	CONFIGFLAGS="${CONFIGFLAGS} --without-hardening"
+	# SHA256 functions in sha2.h conflict with OpenSSL's breaking sk-dummy
+	CONFIGFLAGS="${CONFIGFLAGS} --without-hardening --disable-security-key"
 	;;
     sol10|sol11)
 	# sol10 VM is 32bit and the unit tests are slow.