[openssh-commits] [openssh] 01/01: configure.ac: fix libfido2 back-compat

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

dtucker pushed a commit to branch master
in repository openssh.

commit c1c44eeecddf093a7983bd91e70b446de789b363
Author: pedro martelletto <pedro at ambientworks.net>
Date:   Tue Sep 1 17:01:55 2020 +0200

    configure.ac: fix libfido2 back-compat
    
    - HAVE_FIDO_CRED_PROD -> HAVE_FIDO_CRED_PROT;
    - check for fido_dev_get_touch_begin(), so that
      HAVE_FIDO_DEV_GET_TOUCH_BEGIN gets defined.
---
 configure.ac | 1 +
 sk-usbhid.c  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 7386d742..9ae199bc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3185,6 +3185,7 @@ if test "x$enable_sk" = "xyes" -a "x$enable_sk_internal" = "xyes" ; then
 	AC_CHECK_FUNCS([ \
 		fido_cred_prot \
 		fido_cred_set_prot \
+		fido_dev_get_touch_begin \
 		fido_dev_get_touch_status \
 		fido_dev_supports_cred_prot \
 	])
diff --git a/sk-usbhid.c b/sk-usbhid.c
index 7c8ff8d9..de85b2cb 100644
--- a/sk-usbhid.c
+++ b/sk-usbhid.c
@@ -43,7 +43,7 @@
 #include <fido/credman.h>
 
 /* backwards compat for libfido2 */
-#ifndef HAVE_FIDO_CRED_PROD
+#ifndef HAVE_FIDO_CRED_PROT
 #define fido_cred_prot(x) (0)
 #endif
 #ifndef HAVE_FIDO_CRED_SET_PROT

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.