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

Revert cipher requirement in parse cipher.

Browse Source 
There is several specification that violate this (chacha20 etc).
Just use the old way...
This commit is contained in:
Milan Broz
2018-01-18 22:33:16 +01:00
parent c6a8b6471a
commit f6e613a76f
7 changed files with 18 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/cryptsetup.c
View File

@@ -175,9 +175,9 @@ static int action_open_plain(void)
int r;
r = crypt_parse_name_and_mode(opt_cipher ?: DEFAULT_CIPHER(PLAIN),
cipher, NULL, cipher_mode, 1);
cipher, NULL, cipher_mode);
if (r < 0) {
log_err(_("No known cipher specification pattern (cipher-mode-iv) detected.\n"));
log_err(_("No known cipher specification pattern detected.\n"));
goto out;
}
@@ -744,9 +744,9 @@ static int action_benchmark(void)
opt_pbkdf = CRYPT_KDF_PBKDF2;
r = action_benchmark_kdf(opt_pbkdf, opt_hash, key_size);
} else if (opt_cipher) {
r = crypt_parse_name_and_mode(opt_cipher, cipher, NULL, cipher_mode, 0);
r = crypt_parse_name_and_mode(opt_cipher, cipher, NULL, cipher_mode);
if (r < 0) {
log_err(_("No known cipher specification pattern (cipher-mode-iv) detected.\n"));
log_err(_("No known cipher specification pattern detected.\n"));
return r;
}
if ((c = strchr(cipher_mode, '-')))
@@ -993,9 +993,9 @@ static int action_luksFormat(void)
goto out;
r = crypt_parse_name_and_mode(opt_cipher ?: DEFAULT_CIPHER(LUKS1),
cipher, NULL, cipher_mode, 1);
cipher, NULL, cipher_mode);
if (r < 0) {
log_err(_("No known cipher specification pattern (cipher-mode-iv) detected.\n"));
log_err(_("No known cipher specification pattern detected.\n"));
goto out;
}