eessppeelllloo/cryptsetup
1
0
Fork 0
mirror of https://gitlab.com/cryptsetup/cryptsetup.git synced 2025-12-05 16:00:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix luks2-external-tokens-path option for meson

Browse Source 
The variable was never called default-* in autoconf,
name is the same.

Morever, it defines unneeded DEFAULT_* entry in config.h.
This commit is contained in:
Milan Broz
2025-07-25 22:28:31 +02:00
parent 32e9bed060
commit 70a69b5059
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
meson.build
View File

@@ -31,7 +31,6 @@ default_string_options = [
'default-luks1-cipher', 'default-luks1-cipher',
'default-luks1-hash', 'default-luks1-hash',
'default-luks1-mode', 'default-luks1-mode',
'default-luks2-external-tokens-path',
'default-luks2-keyslot-cipher', 'default-luks2-keyslot-cipher',
'default-luks2-lock-path', 'default-luks2-lock-path',
'default-luks2-pbkdf', 'default-luks2-pbkdf',
@@ -731,12 +730,12 @@ endif
assert(get_option('default-luks2-lock-path').startswith('/'), assert(get_option('default-luks2-lock-path').startswith('/'),
'default-luks2-lock-path has to be an absolute path') 'default-luks2-lock-path has to be an absolute path')
luks2_external_tokens_path = get_option('default-luks2-external-tokens-path') luks2_external_tokens_path = get_option('luks2-external-tokens-path')
if luks2_external_tokens_path == 'LIBDIR/cryptsetup' if luks2_external_tokens_path == ''
luks2_external_tokens_path = join_paths(get_option('prefix'), get_option('libdir'), 'cryptsetup') luks2_external_tokens_path = join_paths(get_option('prefix'), get_option('libdir'), 'cryptsetup')
endif endif
assert(luks2_external_tokens_path.startswith('/'), assert(luks2_external_tokens_path.startswith('/'),
'default-luks2-external-tokens-path has to be an absolute path') 'luks2-external-tokens-path has to be an absolute path')
conf.set_quoted('EXTERNAL_LUKS2_TOKENS_PATH', luks2_external_tokens_path, conf.set_quoted('EXTERNAL_LUKS2_TOKENS_PATH', luks2_external_tokens_path,
description: 'path to directory with LUKSv2 external token handlers (plugins)') description: 'path to directory with LUKSv2 external token handlers (plugins)')

2
meson_options.txt
View File

@@ -12,7 +12,6 @@ option('default-luks1-hash', type : 'string', description : 'hash function for L
option('default-luks1-iter-time', type : 'integer', description : 'PBKDF2 iteration time for LUKS1 (in ms)', value : 2000) option('default-luks1-iter-time', type : 'integer', description : 'PBKDF2 iteration time for LUKS1 (in ms)', value : 2000)
option('default-luks1-keybits', type : 'integer', description : 'key length in bits for LUKS1', value : 256) option('default-luks1-keybits', type : 'integer', description : 'key length in bits for LUKS1', value : 256)
option('default-luks1-mode', type : 'string', description : 'cipher mode for LUKS1', value : 'xts-plain64') option('default-luks1-mode', type : 'string', description : 'cipher mode for LUKS1', value : 'xts-plain64')
option('default-luks2-external-tokens-path', type : 'string', description : 'path to directory with LUKSv2 external token handlers (plugins)', value : 'LIBDIR/cryptsetup')
option('default-luks2-iter-time', type : 'integer', description : 'Argon2 PBKDF iteration time for LUKS2 (in ms)', value : 2000) option('default-luks2-iter-time', type : 'integer', description : 'Argon2 PBKDF iteration time for LUKS2 (in ms)', value : 2000)
option('default-luks2-keyslot-cipher', type : 'string', description : 'fallback cipher for LUKS2 keyslot (if data encryption is incompatible)', value : 'aes-xts-plain64') option('default-luks2-keyslot-cipher', type : 'string', description : 'fallback cipher for LUKS2 keyslot (if data encryption is incompatible)', value : 'aes-xts-plain64')
option('default-luks2-keyslot-keybits', type : 'integer', description : 'fallback key size for LUKS2 keyslot (if data encryption is incompatible)', value : 512) option('default-luks2-keyslot-keybits', type : 'integer', description : 'fallback key size for LUKS2 keyslot (if data encryption is incompatible)', value : 512)
@@ -45,6 +44,7 @@ option('integritysetup', type : 'boolean', description : 'integritysetup Support
option('internal-sse-argon2', type : 'boolean', description : 'use internal SSE implementation of Argon2 PBKDF', value : false) option('internal-sse-argon2', type : 'boolean', description : 'use internal SSE implementation of Argon2 PBKDF', value : false)
option('kernel_crypto', type : 'boolean', description : 'kernel userspace crypto (no benchmark and tcrypt)', value : true) option('kernel_crypto', type : 'boolean', description : 'kernel userspace crypto (no benchmark and tcrypt)', value : true)
option('keyring', type : 'boolean', description : 'kernel keyring support and builtin kernel keyring token', value : true) option('keyring', type : 'boolean', description : 'kernel keyring support and builtin kernel keyring token', value : true)
option('luks2-external-tokens-path', type : 'string', description : 'path to directory with LUKSv2 external token handlers (plugins)')
option('luks2-reencryption', type : 'boolean', description : 'LUKS2 online reencryption extension', value : true) option('luks2-reencryption', type : 'boolean', description : 'LUKS2 online reencryption extension', value : true)
option('luks_adjust_xts_keysize', type : 'boolean', description : 'XTS mode requires two keys, double default LUKS keysize if needed', value : true) option('luks_adjust_xts_keysize', type : 'boolean', description : 'XTS mode requires two keys, double default LUKS keysize if needed', value : true)
option('nls', type : 'boolean', description : 'use Native Language Support', value : true) option('nls', type : 'boolean', description : 'use Native Language Support', value : true)