shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-22 17:35:35 +03:00
Code

tree-wide: never link directly against p11kit

Browse Source 
We go via dlopen() at most places, but forgot some. Cover the missing
cases too.
This commit is contained in:
Lennart Poettering 2023-11-02 14:47:35 +01:00 committed by Luca Boccassi
parent 918ef2eeeb
commit 707de94cbf
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cryptenroll/meson.build
View File

@ -30,7 +30,7 @@ executables += [
libcryptsetup,
libdl,
libopenssl,
libp11kit,
libp11kit_cflags,
],
},
]

2
src/cryptsetup/cryptsetup-tokens/luks2-pkcs11.c
View File

@ -55,7 +55,7 @@ static int luks2_pkcs11_callback(
if (rv != CKR_OK) {
crypt_log_error(data->cd,
"Failed to acquire updated security token information for slot %lu: %s",
slot_id, p11_kit_strerror(rv));
slot_id, sym_p11_kit_strerror(rv));
return -EIO;
}
token_info = &updated_token_info;

2
src/cryptsetup/cryptsetup-tokens/meson.build
View File

@ -69,7 +69,7 @@ modules += [
'sources' : cryptsetup_token_systemd_pkcs11_sources,
'dependencies' : [
libcryptsetup,
libp11kit,
libp11kit_cflags,
],
},
]

2
src/cryptsetup/meson.build
View File

@ -24,7 +24,7 @@ executables += [
'dependencies' : [
libcryptsetup,
libopenssl,
libp11kit,
libp11kit_cflags,
],
},
generator_template + {

6
src/home/homework-pkcs11.c
View File

@ -49,7 +49,7 @@ int pkcs11_callback(
rv = m->C_Login(session, CKU_USER, NULL, 0);
if (rv != CKR_OK)
return log_error_errno(SYNTHETIC_ERRNO(EIO), "Failed to log into security token '%s': %s", token_label, p11_kit_strerror(rv));
return log_error_errno(SYNTHETIC_ERRNO(EIO), "Failed to log into security token '%s': %s", token_label, sym_p11_kit_strerror(rv));
log_info("Successfully logged into security token '%s' via protected authentication path.", token_label);
goto decrypt;
@ -72,12 +72,12 @@ int pkcs11_callback(
if (rv == CKR_PIN_LOCKED)
return log_error_errno(SYNTHETIC_ERRNO(EOWNERDEAD), "PIN of security token is blocked. Please unblock it first.");
if (!IN_SET(rv, CKR_PIN_INCORRECT, CKR_PIN_LEN_RANGE))
return log_error_errno(SYNTHETIC_ERRNO(EIO), "Failed to log into security token '%s': %s", token_label, p11_kit_strerror(rv));
return log_error_errno(SYNTHETIC_ERRNO(EIO), "Failed to log into security token '%s': %s", token_label, sym_p11_kit_strerror(rv));
}
rv = m->C_GetTokenInfo(slot_id, &updated_token_info);
if (rv != CKR_OK)
return log_error_errno(SYNTHETIC_ERRNO(EIO), "Failed to acquire updated security token information for slot %lu: %s", slot_id, p11_kit_strerror(rv));
return log_error_errno(SYNTHETIC_ERRNO(EIO), "Failed to acquire updated security token information for slot %lu: %s", slot_id, sym_p11_kit_strerror(rv));
if (FLAGS_SET(updated_token_info.flags, CKF_USER_PIN_FINAL_TRY))
return log_error_errno(SYNTHETIC_ERRNO(EUCLEAN), "PIN of security token incorrect, only a single try left.");

4
src/home/meson.build
View File

@ -74,7 +74,7 @@ executables += [
libcrypt,
libfdisk,
libopenssl,
libp11kit,
libp11kit_cflags,
threads,
],
},
@ -101,7 +101,7 @@ executables += [
libcrypt,
libdl,
libopenssl,
libp11kit,
libp11kit_cflags,
threads,
],
},