mirror of
https://github.com/freebsd/freebsd-src
synced 2024-10-06 16:40:47 +00:00
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 92ef98b8fa
)
This commit is contained in:
parent
3ec2816ad7
commit
bf6262c210
1
crypto/openssh/sk_config.h
Normal file
1
crypto/openssh/sk_config.h
Normal file
|
@ -0,0 +1 @@
|
||||||
|
#define ENABLE_SK_INTERNAL /**/
|
|
@ -8,5 +8,6 @@ CFLAGS+= -I${SSHDIR} -include ssh_namespace.h
|
||||||
SRCS+= ssh_namespace.h
|
SRCS+= ssh_namespace.h
|
||||||
|
|
||||||
.if ${MK_USB} != "no"
|
.if ${MK_USB} != "no"
|
||||||
CFLAGS+= -DENABLE_SK_INTERNAL=1
|
# Built-in security key support
|
||||||
|
CFLAGS+= -include sk_config.h
|
||||||
.endif
|
.endif
|
||||||
|
|
Loading…
Reference in a new issue