cryptsetup-util: move definition of crypt_token_max()

As it uses streq(), but string-util.h is not included in the header.

diff --git a/src/shared/cryptsetup-util.c b/src/shared/cryptsetup-util.c
index e45e8431bcddd839816d54af23b3077bfa9c5c95..b8281679dc35141604d2393e8bfcfc2275a0287a 100644 (file)
--- a/src/shared/cryptsetup-util.c
+++ b/src/shared/cryptsetup-util.c
@@ -54,6 +54,12 @@ DLSYM_PROTOTYPE(crypt_token_json_get) = NULL;
 DLSYM_PROTOTYPE(crypt_token_json_set) = NULL;
 #if HAVE_CRYPT_TOKEN_MAX
 DLSYM_PROTOTYPE(crypt_token_max) = NULL;
+#else
+int crypt_token_max(_unused_ const char *type) {
+    assert(streq(type, CRYPT_LUKS2));
+
+    return 32;
+}
 #endif
 #if HAVE_CRYPT_TOKEN_SET_EXTERNAL_PATH
 DLSYM_PROTOTYPE(crypt_token_set_external_path) = NULL;

diff --git a/src/shared/cryptsetup-util.h b/src/shared/cryptsetup-util.h
index 6ecc8f601f0f003b5205b4548da33e6400a4a0b4..df897c208ffd9e8afbca0c54f2f73a8733ce953e 100644 (file)
--- a/src/shared/cryptsetup-util.h
+++ b/src/shared/cryptsetup-util.h
@@ -56,11 +56,7 @@ extern DLSYM_PROTOTYPE(crypt_token_json_set);
 extern DLSYM_PROTOTYPE(crypt_token_max);
 #else
 /* As a fallback, use the same hard-coded value libcryptsetup uses internally. */
-static inline int crypt_token_max(_unused_ const char *type) {
-    assert(streq(type, CRYPT_LUKS2));
-
-    return 32;
-}
+int crypt_token_max(_unused_ const char *type);
 #define sym_crypt_token_max(type) crypt_token_max(type)
 #endif
 #if HAVE_CRYPT_TOKEN_SET_EXTERNAL_PATH