From 707de94cbf583dc211a5f9f44f66f94e2a4f3977 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 2 Nov 2023 14:47:35 +0100
Subject: [PATCH] tree-wide: never link directly against p11kit

We go via dlopen() at most places, but forgot some. Cover the missing
cases too.
---
 src/cryptenroll/meson.build                     | 2 +-
 src/cryptsetup/cryptsetup-tokens/luks2-pkcs11.c | 2 +-
 src/cryptsetup/cryptsetup-tokens/meson.build    | 2 +-
 src/cryptsetup/meson.build                      | 2 +-
 src/home/homework-pkcs11.c                      | 6 +++---
 src/home/meson.build                            | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/cryptenroll/meson.build b/src/cryptenroll/meson.build
index fa171ea47a5..5374d65aba6 100644
--- a/src/cryptenroll/meson.build
+++ b/src/cryptenroll/meson.build
@@ -30,7 +30,7 @@ executables += [
                         libcryptsetup,
                         libdl,
                         libopenssl,
-                        libp11kit,
+                        libp11kit_cflags,
                 ],
         },
 ]
diff --git a/src/cryptsetup/cryptsetup-tokens/luks2-pkcs11.c b/src/cryptsetup/cryptsetup-tokens/luks2-pkcs11.c
index 4bbec0fe1ad..98fd83a014c 100644
--- a/src/cryptsetup/cryptsetup-tokens/luks2-pkcs11.c
+++ b/src/cryptsetup/cryptsetup-tokens/luks2-pkcs11.c
@@ -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;
diff --git a/src/cryptsetup/cryptsetup-tokens/meson.build b/src/cryptsetup/cryptsetup-tokens/meson.build
index 88665202a0d..b26940c6a3b 100644
--- a/src/cryptsetup/cryptsetup-tokens/meson.build
+++ b/src/cryptsetup/cryptsetup-tokens/meson.build
@@ -69,7 +69,7 @@ modules += [
                 'sources' : cryptsetup_token_systemd_pkcs11_sources,
                 'dependencies' : [
                         libcryptsetup,
-                        libp11kit,
+                        libp11kit_cflags,
                 ],
         },
 ]
diff --git a/src/cryptsetup/meson.build b/src/cryptsetup/meson.build
index e034cb7d244..90e2be7a911 100644
--- a/src/cryptsetup/meson.build
+++ b/src/cryptsetup/meson.build
@@ -24,7 +24,7 @@ executables += [
                 'dependencies' : [
                         libcryptsetup,
                         libopenssl,
-                        libp11kit,
+                        libp11kit_cflags,
                 ],
         },
         generator_template + {
diff --git a/src/home/homework-pkcs11.c b/src/home/homework-pkcs11.c
index be9d905c0e4..f3719948d01 100644
--- a/src/home/homework-pkcs11.c
+++ b/src/home/homework-pkcs11.c
@@ -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.");
diff --git a/src/home/meson.build b/src/home/meson.build
index b909cfdd47b..09831dee452 100644
--- a/src/home/meson.build
+++ b/src/home/meson.build
@@ -74,7 +74,7 @@ executables += [
                         libcrypt,
                         libfdisk,
                         libopenssl,
-                        libp11kit,
+                        libp11kit_cflags,
                         threads,
                 ],
         },
@@ -101,7 +101,7 @@ executables += [
                         libcrypt,
                         libdl,
                         libopenssl,
-                        libp11kit,
+                        libp11kit_cflags,
                         threads,
                 ],
         },