mirror of
https://github.com/systemd/systemd
synced 2025-10-05 16:03:15 +02:00
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 d8b60944f5
.
This commit is contained in:
committed by
Zbigniew Jędrzejewski-Szmek
parent
d15343d561
commit
463f0a027a
2
README
2
README
@@ -245,7 +245,7 @@ REQUIREMENTS:
|
|||||||
gnutls >= 3.1.4 (optional)
|
gnutls >= 3.1.4 (optional)
|
||||||
openssl >= 1.1.0 (optional, required to support DNS-over-TLS)
|
openssl >= 1.1.0 (optional, required to support DNS-over-TLS)
|
||||||
p11-kit >= 0.23.3 (optional)
|
p11-kit >= 0.23.3 (optional)
|
||||||
libfido2 >= 1.5.0 (optional)
|
libfido2 (optional)
|
||||||
tpm2-tss (optional)
|
tpm2-tss (optional)
|
||||||
elfutils >= 158 (optional)
|
elfutils >= 158 (optional)
|
||||||
polkit (optional)
|
polkit (optional)
|
||||||
|
@@ -1354,7 +1354,6 @@ feature = get_option('libfido2').require(
|
|||||||
conf.get('HAVE_OPENSSL') == 1,
|
conf.get('HAVE_OPENSSL') == 1,
|
||||||
error_message : 'openssl required')
|
error_message : 'openssl required')
|
||||||
libfido2 = dependency('libfido2',
|
libfido2 = dependency('libfido2',
|
||||||
version : '>=1.5.0',
|
|
||||||
required : feature)
|
required : feature)
|
||||||
conf.set10('HAVE_LIBFIDO2', libfido2.found())
|
conf.set10('HAVE_LIBFIDO2', libfido2.found())
|
||||||
|
|
||||||
|
@@ -16,6 +16,11 @@
|
|||||||
#include "strv.h"
|
#include "strv.h"
|
||||||
#include "unistd.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;
|
static void *libfido2_dl = NULL;
|
||||||
|
|
||||||
DLSYM_PROTOTYPE(fido_assert_allow_cred) = NULL;
|
DLSYM_PROTOTYPE(fido_assert_allow_cred) = NULL;
|
||||||
|
Reference in New Issue
Block a user