From bf6262c210d49cf52545e3e26de850890ae845ea Mon Sep 17 00:00:00 2001
From: Ed Maste <emaste@FreeBSD.org>
Date: Tue, 1 Mar 2022 16:42:13 -0500
Subject: [PATCH] ssh: use standalone config file for security key support

An upcoming OpenSSH update has multiple config.h settings that change
depending on whether builtin security key support is enabled.  Prepare
for this by moving ENABLE_SK_INTERNAL to a new sk_config.h header
(similar to the approach used for optional krb5 support) and optionally
including that, instead of defining the macro directly from CFLAGS.

Reviewed by:	kevans
MFC after:	2 weeks
Sponsored by:	The FreeBSD Foundation
Differential Revision:	https://reviews.freebsd.org/D34407

(cherry picked from commit 92ef98b8fa9273049af3cf2fcb4f5e13a6775ff8)
---
 crypto/openssh/sk_config.h | 1 +
 secure/ssh.mk              | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 crypto/openssh/sk_config.h

diff --git a/crypto/openssh/sk_config.h b/crypto/openssh/sk_config.h
new file mode 100644
index 000000000000..b22487587dfc
--- /dev/null
+++ b/crypto/openssh/sk_config.h
@@ -0,0 +1 @@
+#define ENABLE_SK_INTERNAL /**/
diff --git a/secure/ssh.mk b/secure/ssh.mk
index 822946253263..9ee533c10eca 100644
--- a/secure/ssh.mk
+++ b/secure/ssh.mk
@@ -8,5 +8,6 @@ CFLAGS+= -I${SSHDIR} -include ssh_namespace.h
 SRCS+=	 ssh_namespace.h
 
 .if ${MK_USB} != "no"
-CFLAGS+=	-DENABLE_SK_INTERNAL=1
+# Built-in security key support
+CFLAGS+= -include sk_config.h
 .endif