chiark / gitweb /
Revert "cryptsetup: pass 0 as key size to crypt_activate_by_keyfile()"
authorLennart Poettering <lennart@poettering.net>
Thu, 21 Apr 2011 01:15:12 +0000 (03:15 +0200)
committerLennart Poettering <lennart@poettering.net>
Thu, 21 Apr 2011 01:15:12 +0000 (03:15 +0200)
This reverts commit 9402841ef197e485061ab328edcaa0e6d83051bd.

This freezes boot-up when /dev/urandom is used as key source

src/cryptsetup.c

index d7c458ad8c823b50a7705c8a14b8c8eb3c3badc0..4ef9606d39fabc415e003ab0736ab426a9f7618a 100644 (file)
@@ -447,7 +447,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, 0, flags);
+                                k = crypt_activate_by_keyfile(cd, argv[2], CRYPT_ANY_SLOT, key_file, opt_key_size, flags);
                         else {
                                 char **p;