meson: Fix mode variable to be a string

This way we do not risk it being converted into decimal 448 or
octal 700 without the leading zero.

Fixes: #983.

Author: Kristina Hanicova

meson.build

@@ -48,7 +48,6 @@ default_int_options = [
     'default-luks1-keybits',
     'default-luks2-iter-time',
     'default-luks2-keyslot-keybits',
-    'default-luks2-lock-dir-perms',
     'default-luks2-memory-kb',
     'default-luks2-parallel-threads',
     'default-passphrase-size-max',
@@ -67,6 +66,8 @@ foreach default_option : (default_int_options)
     conf.set(default_option.underscorify().to_upper(), get_option(default_option))
 endforeach
 
+conf.set('DEFAULT_LUKS2_LOCK_DIR_PERMS', get_option('default-luks2-lock-dir-perms'))
+
 sanitizer = get_option('b_sanitize')
 sanitizer_enabled = sanitizer != '' and sanitizer != 'none'
 

meson_options.txt

@@ -15,7 +15,7 @@ option('default-luks1-mode', type : 'string', description : 'cipher mode for LUK
 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-keybits', type : 'integer', description : 'fallback key size for LUKS2 keyslot (if data encryption is incompatible)', value : 512)
-option('default-luks2-lock-dir-perms', type : 'integer', description : 'default luks2 locking directory permissions', value : 0o700)
+option('default-luks2-lock-dir-perms', type : 'string', description : 'default LUKS2 locking directory permissions', value : '0700')
 option('default-luks2-lock-path', type : 'string', description : 'path to directory for LUKSv2 locks', value : '/run/cryptsetup')
 option('default-luks2-memory-kb', type : 'integer', description : 'Argon2 PBKDF memory cost for LUKS2 (in kB)', value : 1048576)
 option('default-luks2-parallel-threads', type : 'integer', description : 'Argon2 PBKDF max parallel cost for LUKS2 (if CPUs available)', value : 4)