cryptsetup: don't line-break so aggressively
This commit is contained in:
parent
b7a0fead10
commit
aed68083c0
|
@ -527,23 +527,16 @@ static int attach_luks_or_plain(struct crypt_device *cd,
|
||||||
cipher_mode = "cbc-essiv:sha256";
|
cipher_mode = "cbc-essiv:sha256";
|
||||||
}
|
}
|
||||||
|
|
||||||
/* for CRYPT_PLAIN limit reads
|
/* for CRYPT_PLAIN limit reads from keyfile to key length, and ignore keyfile-size */
|
||||||
* from keyfile to key length, and
|
|
||||||
* ignore keyfile-size */
|
|
||||||
arg_keyfile_size = arg_key_size;
|
arg_keyfile_size = arg_key_size;
|
||||||
|
|
||||||
/* In contrast to what the name
|
/* In contrast to what the name crypt_setup() might suggest this doesn't actually format
|
||||||
* crypt_setup() might suggest this
|
* anything, it just configures encryption parameters when used for plain mode. */
|
||||||
* doesn't actually format anything,
|
|
||||||
* it just configures encryption
|
|
||||||
* parameters when used for plain
|
|
||||||
* mode. */
|
|
||||||
r = crypt_format(cd, CRYPT_PLAIN, cipher, cipher_mode, NULL, NULL, arg_keyfile_size, ¶ms);
|
r = crypt_format(cd, CRYPT_PLAIN, cipher, cipher_mode, NULL, NULL, arg_keyfile_size, ¶ms);
|
||||||
|
|
||||||
/* hash == NULL implies the user passed "plain" */
|
/* hash == NULL implies the user passed "plain" */
|
||||||
pass_volume_key = (params.hash == NULL);
|
pass_volume_key = (params.hash == NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (r < 0)
|
if (r < 0)
|
||||||
return log_error_errno(r, "Loading of cryptographic parameters failed: %m");
|
return log_error_errno(r, "Loading of cryptographic parameters failed: %m");
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue