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

This commit is contained in:

Ed Maste

2022-03-01 16:42:13 -05:00

parent d94d94e2c0

commit 92ef98b8fa

2 changed files with 3 additions and 1 deletions

									
										crypto/openssh/sk_config.h
									
		+1
		
												View File
												
				@@ -0,0 +1 @@

				#define ENABLE_SK_INTERNAL /**/

									
										secure/ssh.mk
									
		+2
		-1
	
												View File
												
				@@ -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

				`@@ -0,0 +1 @@`
				`#define ENABLE_SK_INTERNAL /**/`