Attachment 45912 Details for Bug 36264 – Proposed patch (not tested!)

[patch] Proposed patch (not tested!)

tst.patch (text/plain), 1.32 KB, created by Milan Broz on 2011-04-21 04:30:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Milan Broz

Created: 2011-04-21 04:30:53 UTC

Size: 1.32 KB

patch

obsolete

>diff --git a/src/cryptsetup.c b/src/cryptsetup.c
>index 4ef9606..4214710 100644
>--- a/src/cryptsetup.c
>+++ b/src/cryptsetup.c
>@@ -225,6 +225,7 @@ int main(int argc, char *argv[]) {
>         char **passwords = NULL, *truncated_cipher = NULL;
>         const char *cipher = NULL, *cipher_mode = NULL, *hash = NULL, *name = NULL;
>         char *description = NULL, *name_buffer = NULL, *mount_point = NULL;
>+        unsigned keyfile_size = 0;
> 
>         if (argc <= 1) {
>                 help();
>@@ -433,6 +434,10 @@ int main(int argc, char *argv[]) {
>                                                  &params);
> 
>                                 pass_volume_key = streq(hash, "plain");
>+
>+				/* for CRYPT_PLAIN limit reads
>+				 * from keyfile to key length */
>+                                keyfile_size = opt_key_size / 8;
>                         }
> 
>                         if (k < 0) {
>@@ -447,7 +452,7 @@ int main(int argc, char *argv[]) {
>                                  argv[3]);
> 
>                         if (key_file)
>-                                k = crypt_activate_by_keyfile(cd, argv[2], CRYPT_ANY_SLOT, key_file, opt_key_size, flags);
>+                                k = crypt_activate_by_keyfile(cd, argv[2], CRYPT_ANY_SLOT, key_file, keyfile_size, flags);
>                         else {
>                                 char **p;
>

Actions: View | Splinter Review

Attachments on bug 36264: 45676 | 45912

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.