picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix keysize handling in cryptsetup (bits vs. bytes)

Browse source 
The command line key-size is in bits but the libcryptsetup API expects bytes.

Note that the modulo 8 check is in the original cryptsetup binary as well, so
it's no new limitation.

(v2: changed the point at which the /= 8 is performed, rebased, removed tabs)
This commit is contained in:
David Härdeman 2014-03-25 11:05:28 +01:00 committed by Lennart Poettering
parent 9fa1de965a
commit 6131a78b4d
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/cryptsetup/cryptsetup.c
View file

@ -88,6 +88,13 @@ static int parse_one_option(const char *option) {
return 0;
}
if (arg_key_size % 8) {
log_error("size= not a multiple of 8, ignoring.");
return 0;
}
arg_key_size /= 8;
} else if (startswith(option, "key-slot=")) {
arg_type = CRYPT_LUKS1;
@ -414,7 +421,7 @@ static int attach_luks_or_plain(struct crypt_device *cd,
/* for CRYPT_PLAIN limit reads
* from keyfile to key length, and
* ignore keyfile-size */
arg_keyfile_size = arg_key_size / 8;
arg_keyfile_size = arg_key_size;
/* In contrast to what the name
* crypt_setup() might suggest this
@ -577,7 +584,7 @@ int main(int argc, char *argv[]) {
else
until = 0;
arg_key_size = (arg_key_size > 0 ? arg_key_size : 256);
arg_key_size = (arg_key_size > 0 ? arg_key_size : (256 / 8));
if (key_file) {
struct stat st;