diff options
author | pedro martelletto <pedro@ambientworks.net> | 2020-09-01 17:01:55 +0200 |
---|---|---|
committer | Darren Tucker <dtucker@dtucker.net> | 2020-09-02 12:27:27 +1000 |
commit | c1c44eeecddf093a7983bd91e70b446de789b363 (patch) | |
tree | b653eb72d534032216c43ac7e91397b7ada8f6a5 | |
parent | 785f0f315bf7ac5909e988bb1ac3e019fb5e1594 (diff) |
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.
-rw-r--r-- | configure.ac | 1 | ||||
-rw-r--r-- | sk-usbhid.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 7386d742d..9ae199bc7 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -3185,6 +3185,7 @@ if test "x$enable_sk" = "xyes" -a "x$enable_sk_internal" = "xyes" ; then | |||
3185 | AC_CHECK_FUNCS([ \ | 3185 | AC_CHECK_FUNCS([ \ |
3186 | fido_cred_prot \ | 3186 | fido_cred_prot \ |
3187 | fido_cred_set_prot \ | 3187 | fido_cred_set_prot \ |
3188 | fido_dev_get_touch_begin \ | ||
3188 | fido_dev_get_touch_status \ | 3189 | fido_dev_get_touch_status \ |
3189 | fido_dev_supports_cred_prot \ | 3190 | fido_dev_supports_cred_prot \ |
3190 | ]) | 3191 | ]) |
diff --git a/sk-usbhid.c b/sk-usbhid.c index 7c8ff8d98..de85b2cb3 100644 --- a/sk-usbhid.c +++ b/sk-usbhid.c | |||
@@ -43,7 +43,7 @@ | |||
43 | #include <fido/credman.h> | 43 | #include <fido/credman.h> |
44 | 44 | ||
45 | /* backwards compat for libfido2 */ | 45 | /* backwards compat for libfido2 */ |
46 | #ifndef HAVE_FIDO_CRED_PROD | 46 | #ifndef HAVE_FIDO_CRED_PROT |
47 | #define fido_cred_prot(x) (0) | 47 | #define fido_cred_prot(x) (0) |
48 | #endif | 48 | #endif |
49 | #ifndef HAVE_FIDO_CRED_SET_PROT | 49 | #ifndef HAVE_FIDO_CRED_SET_PROT |