configure flag to built-in security key support

Require --with-security-key-builtin before enabling the built-in
security key support (and consequent dependency on libfido2).
This commit is contained in:
Damien Miller 2019-11-15 16:08:00 +11:00
parent fbcb9a7fa5
commit 5c0bc273cb
2 changed files with 12 additions and 1 deletions

View File

@ -66,6 +66,7 @@ Flag | Meaning
``--with-libedit`` | Enable [libedit](https://www.thrysoee.dk/editline/) support for sftp. ``--with-libedit`` | Enable [libedit](https://www.thrysoee.dk/editline/) support for sftp.
``--with-kerberos5`` | Enable Kerberos/GSSAPI support. Both [Heimdal](https://www.h5l.org/) and [MIT](https://web.mit.edu/kerberos/) Kerberos implementations are supported. ``--with-kerberos5`` | Enable Kerberos/GSSAPI support. Both [Heimdal](https://www.h5l.org/) and [MIT](https://web.mit.edu/kerberos/) Kerberos implementations are supported.
``--with-selinux`` | Enable [SELinux](https://en.wikipedia.org/wiki/Security-Enhanced_Linux) support. ``--with-selinux`` | Enable [SELinux](https://en.wikipedia.org/wiki/Security-Enhanced_Linux) support.
``--with-security-key-builtin`` | Include built-in support for U2F/FIDO2 security keys. This requires [libfido2](https://github.com/Yubico/libfido2) be installed.
## Development ## Development

View File

@ -1908,6 +1908,16 @@ AC_ARG_ENABLE([security-key],
fi fi
] ]
) )
enable_sk_internal=
AC_ARG_WITH([security-key-builtin],
[ --with-security-key-builtin include builtin U2F/FIDO support],
[
if test "x$withval" != "xno" ; then
enable_sk_internal=yes
fi
]
)
test "x$disable_sk" != "x" && enable_sk_internal=""
AC_SEARCH_LIBS([dlopen], [dl]) AC_SEARCH_LIBS([dlopen], [dl])
AC_CHECK_FUNCS([dlopen]) AC_CHECK_FUNCS([dlopen])
@ -3062,7 +3072,7 @@ fi
AC_MSG_RESULT([$enable_sk]) AC_MSG_RESULT([$enable_sk])
# Now check for built-in security key support. # Now check for built-in security key support.
if test "x$enable_sk" = "xyes" ; then if test "x$enable_sk" = "xyes" -a "x$enable_sk_internal" = "xyes" ; then
AC_PATH_TOOL([PKGCONFIG], [pkg-config], [no]) AC_PATH_TOOL([PKGCONFIG], [pkg-config], [no])
use_pkgconfig_for_libfido2= use_pkgconfig_for_libfido2=
if test "x$PKGCONFIG" != "xno"; then if test "x$PKGCONFIG" != "xno"; then