From 463f0a027a6a6a842bd026979a9aeb841c732bb1 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Thu, 18 Sep 2025 17:29:41 +0100 Subject: [PATCH] Revert "Bump required minimum version of libfido2 to 1.5.0" and add missing def instead It helps nobody to break compatibility for a missing definition for printing an error. Just add the missing definition if not present, as it is already done for thousands of others from the kernel, glibc, etc. This partially reverts commit d8b60944f5f752a06ad1553ca77b04b7fea903e9. --- README | 2 +- meson.build | 1 - src/shared/libfido2-util.c | 5 +++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/README b/README index 979807cda6e..eea3a55fbb8 100644 --- a/README +++ b/README @@ -245,7 +245,7 @@ REQUIREMENTS: gnutls >= 3.1.4 (optional) openssl >= 1.1.0 (optional, required to support DNS-over-TLS) p11-kit >= 0.23.3 (optional) - libfido2 >= 1.5.0 (optional) + libfido2 (optional) tpm2-tss (optional) elfutils >= 158 (optional) polkit (optional) diff --git a/meson.build b/meson.build index bf58d536f4e..5ae8763afdc 100644 --- a/meson.build +++ b/meson.build @@ -1354,7 +1354,6 @@ feature = get_option('libfido2').require( conf.get('HAVE_OPENSSL') == 1, error_message : 'openssl required') libfido2 = dependency('libfido2', - version : '>=1.5.0', required : feature) conf.set10('HAVE_LIBFIDO2', libfido2.found()) diff --git a/src/shared/libfido2-util.c b/src/shared/libfido2-util.c index bbca00ceeb8..5bcd5388b0c 100644 --- a/src/shared/libfido2-util.c +++ b/src/shared/libfido2-util.c @@ -16,6 +16,11 @@ #include "strv.h" #include "unistd.h" +/* Added in version 1.5.0 */ +#ifndef FIDO_ERR_UV_BLOCKED +#define FIDO_ERR_UV_BLOCKED 0x3c +#endif + static void *libfido2_dl = NULL; DLSYM_PROTOTYPE(fido_assert_allow_cred) = NULL;