git: 92ef98b8fa92 - main - ssh: use standalone config file for security key support

The branch main has been updated by emaste:

URL: https://cgit.FreeBSD.org/src/commit/?id=92ef98b8fa9273049af3cf2fcb4f5e13a6775ff8

commit 92ef98b8fa9273049af3cf2fcb4f5e13a6775ff8
Author:     Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2022-03-01 21:42:13 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
CommitDate: 2022-03-02 14:35:12 +0000

    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
---
 crypto/openssh/sk_config.h | 1 +
 secure/ssh.mk              | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

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