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

Override password quality check if used cipher is cipher_null.

Browse Source
This commit is contained in:
Milan Broz
2015-08-27 16:21:07 +02:00
parent c25d81d2a1
commit 65fa22ff23
3 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/cryptsetup.c
View File

@@ -708,6 +708,10 @@ static int action_luksFormat(void)
goto out; goto out;
} }
/* Never call pwquality if using null cipher */
if (tools_is_cipher_null(cipher))
opt_force_password = 1;
if ((r = crypt_init(&cd, header_device))) { if ((r = crypt_init(&cd, header_device))) {
if (opt_header_device) if (opt_header_device)
log_err(_("Cannot use %s as on-disk header.\n"), header_device); log_err(_("Cannot use %s as on-disk header.\n"), header_device);
@@ -964,6 +968,10 @@ static int action_luksAddKey(void)
if ((r = crypt_load(cd, CRYPT_LUKS1, NULL))) if ((r = crypt_load(cd, CRYPT_LUKS1, NULL)))
goto out; goto out;
/* Never call pwquality if using null cipher */
if (tools_is_cipher_null(crypt_get_cipher(cd)))
opt_force_password = 1;
keysize = crypt_get_volume_key_size(cd); keysize = crypt_get_volume_key_size(cd);
/* FIXME: lib cannot properly set verification for new/old passphrase */ /* FIXME: lib cannot properly set verification for new/old passphrase */
crypt_set_password_verify(cd, _verify_passphrase(0)); crypt_set_password_verify(cd, _verify_passphrase(0));
@@ -1045,6 +1053,10 @@ static int action_luksChangeKey(void)
if ((r = crypt_load(cd, CRYPT_LUKS1, NULL))) if ((r = crypt_load(cd, CRYPT_LUKS1, NULL)))
goto out; goto out;
/* Never call pwquality if using null cipher */
if (tools_is_cipher_null(crypt_get_cipher(cd)))
opt_force_password = 1;
if (opt_iteration_time) if (opt_iteration_time)
crypt_set_iteration_time(cd, opt_iteration_time); crypt_set_iteration_time(cd, opt_iteration_time);

1
src/cryptsetup.h
View File

@@ -83,6 +83,7 @@ int tools_get_key(const char *prompt,
struct crypt_device *cd); struct crypt_device *cd);
int tools_is_stdin(const char *key_file); int tools_is_stdin(const char *key_file);
int tools_string_to_size(struct crypt_device *cd, const char *s, uint64_t *size); int tools_string_to_size(struct crypt_device *cd, const char *s, uint64_t *size);
int tools_is_cipher_null(const char *cipher);
/* Log */ /* Log */
#define log_dbg(x...) clogger(NULL, CRYPT_LOG_DEBUG, __FILE__, __LINE__, x) #define log_dbg(x...) clogger(NULL, CRYPT_LOG_DEBUG, __FILE__, __LINE__, x)

8
src/utils_password.c
View File

@@ -65,6 +65,14 @@ static int tools_check_pwquality(const char *password)
} }
#endif /* ENABLE_PWQUALITY */ #endif /* ENABLE_PWQUALITY */
int tools_is_cipher_null(const char *cipher)
{
if (!cipher)
return 0;
return !strcmp(cipher, "cipher_null") ? 1 : 0;
}
/* /*
* Keyfile - is standard input treated as a binary file (no EOL handling). * Keyfile - is standard input treated as a binary file (no EOL handling).
*/ */