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

Use #if for other ENABLE* options.

Browse Source
This commit is contained in:
Milan Broz
2025-01-16 12:36:51 +01:00
parent ff81791308
commit 37d52876b9
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/nls.h
View File

@@ -12,7 +12,7 @@
# define setlocale(Category, Locale) /* empty */ # define setlocale(Category, Locale) /* empty */
#endif #endif
#ifdef ENABLE_NLS #if ENABLE_NLS
# include <libintl.h> # include <libintl.h>
# define _(Text) gettext (Text) # define _(Text) gettext (Text)
# ifdef gettext_noop # ifdef gettext_noop

2
src/cryptsetup.c
View File

@@ -3619,7 +3619,7 @@ static void help(poptContext popt_context,
DEFAULT_CIPHER(PLAIN), DEFAULT_PLAIN_KEYBITS, DEFAULT_PLAIN_HASH, DEFAULT_CIPHER(PLAIN), DEFAULT_PLAIN_KEYBITS, DEFAULT_PLAIN_HASH,
DEFAULT_CIPHER(LUKS1), DEFAULT_LUKS1_KEYBITS, DEFAULT_LUKS1_HASH, DEFAULT_CIPHER(LUKS1), DEFAULT_LUKS1_KEYBITS, DEFAULT_LUKS1_HASH,
DEFAULT_RNG); DEFAULT_RNG);
#if defined(ENABLE_LUKS_ADJUST_XTS_KEYSIZE) && DEFAULT_LUKS1_KEYBITS != 512 #if ENABLE_LUKS_ADJUST_XTS_KEYSIZE && DEFAULT_LUKS1_KEYBITS != 512
log_std(_("\tLUKS: Default keysize with XTS mode (two internal keys) will be doubled.\n")); log_std(_("\tLUKS: Default keysize with XTS mode (two internal keys) will be doubled.\n"));
#endif #endif
tools_cleanup(); tools_cleanup();

2
src/utils_luks.c
View File

@@ -143,7 +143,7 @@ int get_adjusted_key_size(const char *cipher_mode, uint32_t default_size_bits, i
{ {
uint32_t keysize_bits = ARG_UINT32(OPT_KEY_SIZE_ID); uint32_t keysize_bits = ARG_UINT32(OPT_KEY_SIZE_ID);
#ifdef ENABLE_LUKS_ADJUST_XTS_KEYSIZE #if ENABLE_LUKS_ADJUST_XTS_KEYSIZE
if (!ARG_SET(OPT_KEY_SIZE_ID) && !strncmp(cipher_mode, "xts-", 4)) { if (!ARG_SET(OPT_KEY_SIZE_ID) && !strncmp(cipher_mode, "xts-", 4)) {
if (default_size_bits == 128) if (default_size_bits == 128)
keysize_bits = 256; keysize_bits = 256;

2
src/utils_tools.c
View File

@@ -434,7 +434,7 @@ void tools_package_version(const char *name, bool use_pwlibs)
#if KERNEL_KEYRING #if KERNEL_KEYRING
keyring = true; keyring = true;
#endif #endif
#ifdef ENABLE_FIPS #if ENABLE_FIPS
fips = true; fips = true;
#endif #endif
#if ENABLE_AF_ALG #if ENABLE_AF_ALG