From aed68083c045175dd7b5852012e553401f6b51c8 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 21 Jan 2019 20:14:42 +0100 Subject: [PATCH] cryptsetup: don't line-break so aggressively --- src/cryptsetup/cryptsetup.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c index bc4ff5f5a7..7264401200 100644 --- a/src/cryptsetup/cryptsetup.c +++ b/src/cryptsetup/cryptsetup.c @@ -527,23 +527,16 @@ static int attach_luks_or_plain(struct crypt_device *cd, cipher_mode = "cbc-essiv:sha256"; } - /* for CRYPT_PLAIN limit reads - * from keyfile to key length, and - * ignore keyfile-size */ + /* for CRYPT_PLAIN limit reads from keyfile to key length, and ignore keyfile-size */ arg_keyfile_size = arg_key_size; - /* In contrast to what the name - * crypt_setup() might suggest this - * doesn't actually format anything, - * it just configures encryption - * parameters when used for plain - * mode. */ + /* In contrast to what the name crypt_setup() might suggest this 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); /* hash == NULL implies the user passed "plain" */ pass_volume_key = (params.hash == NULL); } - if (r < 0) return log_error_errno(r, "Loading of cryptographic parameters failed: %m");