lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Mon, 6 Jul 2020 21:47:26 +0200 From: Florian Schmaus <flo@...kplace.eu> To: linux-ext4@...r.kernel.org Cc: Florian Schmaus <flo@...kplace.eu> Subject: [PATCH 2/3] e4crypt: refactor set_policy a little Remove the superfluous 'salt' variable and simply use the functions parameter instead. Signed-off-by: Florian Schmaus <flo@...kplace.eu> --- misc/e4crypt.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/misc/e4crypt.c b/misc/e4crypt.c index c82c6f8f..23980073 100644 --- a/misc/e4crypt.c +++ b/misc/e4crypt.c @@ -344,10 +344,9 @@ static void parse_salt(char *salt_str, int flags) add_salt(salt_buf, salt_len); } -static void set_policy(struct salt *set_salt, int pad, +static void set_policy(struct salt *salt, int pad, int argc, char *argv[], int path_start_index) { - struct salt *salt; struct ext4_encryption_policy policy; uuid_t uu; int fd; @@ -366,9 +365,7 @@ static void set_policy(struct salt *set_salt, int pad, perror(argv[x]); exit(1); } - if (set_salt) - salt = set_salt; - else { + if (!salt) { if (ioctl(fd, EXT4_IOC_GET_ENCRYPTION_PWSALT, &uu) < 0) { perror("EXT4_IOC_GET_ENCRYPTION_PWSALT"); -- 2.26.2
Powered by blists - more mailing lists