GitHub-Mirror/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2025-10-06 00:13:24 +02:00
Code Issues Releases Wiki Activity

Bump required minimum version of libfido2 to 1.5.0

Browse Source 
Major distributions already have libfido2 >= 1.12.0.
Let's bump the required minimum version to 1.5.0, which provides
FIDO_ERR_UV_BLOCKED.

Note, libfido2 1.5.0 was released on 2020-09-01.

See also #38608.
This commit is contained in:
Yu Watanabe
2025-08-18 00:39:21 +09:00
parent c6e6c85f83
commit d8b60944f5
3 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README
View File

@@ -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 (optional) libfido2 >= 1.5.0 (optional)
tpm2-tss (optional) tpm2-tss (optional)
elfutils >= 158 (optional) elfutils >= 158 (optional)
polkit (optional) polkit (optional)

1
meson.build
View File

@@ -1351,6 +1351,7 @@ 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())

4
src/shared/libfido2-util.c
View File

@@ -271,11 +271,9 @@ static int fido2_common_assert_error_handle(int r) {
case FIDO_ERR_PIN_AUTH_BLOCKED: case FIDO_ERR_PIN_AUTH_BLOCKED:
return log_error_errno(SYNTHETIC_ERRNO(EOWNERDEAD), return log_error_errno(SYNTHETIC_ERRNO(EOWNERDEAD),
"PIN of security token is blocked, please remove/reinsert token."); "PIN of security token is blocked, please remove/reinsert token.");
#ifdef FIDO_ERR_UV_BLOCKED
case FIDO_ERR_UV_BLOCKED: case FIDO_ERR_UV_BLOCKED:
return log_error_errno(SYNTHETIC_ERRNO(EOWNERDEAD), return log_error_errno(SYNTHETIC_ERRNO(EOWNERDEAD),
"Verification of security token is blocked, please remove/reinsert token."); "Verification of security token is blocked, please remove/reinsert token.");
#endif
case FIDO_ERR_PIN_INVALID: case FIDO_ERR_PIN_INVALID:
return log_error_errno(SYNTHETIC_ERRNO(ENOLCK), return log_error_errno(SYNTHETIC_ERRNO(ENOLCK),
"PIN of security token incorrect."); "PIN of security token incorrect.");
@@ -937,11 +935,9 @@ int fido2_generate_hmac_hash(
if (r == FIDO_ERR_PIN_AUTH_BLOCKED) if (r == FIDO_ERR_PIN_AUTH_BLOCKED)
return log_notice_errno(SYNTHETIC_ERRNO(EPERM), return log_notice_errno(SYNTHETIC_ERRNO(EPERM),
"Token PIN is currently blocked, please remove and reinsert token."); "Token PIN is currently blocked, please remove and reinsert token.");
#ifdef FIDO_ERR_UV_BLOCKED
if (r == FIDO_ERR_UV_BLOCKED) if (r == FIDO_ERR_UV_BLOCKED)
return log_notice_errno(SYNTHETIC_ERRNO(EPERM), return log_notice_errno(SYNTHETIC_ERRNO(EPERM),
"Token verification is currently blocked, please remove and reinsert token."); "Token verification is currently blocked, please remove and reinsert token.");
#endif
if (r == FIDO_ERR_ACTION_TIMEOUT) if (r == FIDO_ERR_ACTION_TIMEOUT)
return log_error_errno(SYNTHETIC_ERRNO(ENOSTR), return log_error_errno(SYNTHETIC_ERRNO(ENOSTR),
"Token action timeout. (User didn't interact with token quickly enough.)"); "Token action timeout. (User didn't interact with token quickly enough.)");