From 1c1890bee6b357ea963f2340fd2b2c25e70dc30d Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 21 Apr 2011 03:15:12 +0200 Subject: [PATCH] Revert "cryptsetup: pass 0 as key size to crypt_activate_by_keyfile()" This reverts commit 9402841ef197e485061ab328edcaa0e6d83051bd. This freezes boot-up when /dev/urandom is used as key source --- src/cryptsetup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cryptsetup.c b/src/cryptsetup.c index d7c458ad8c8..4ef9606d39f 100644 --- a/src/cryptsetup.c +++ b/src/cryptsetup.c @@ -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;