summaryrefslogtreecommitdiff
path: root/src/cryptsetup.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2011-04-21 03:15:12 +0200
committerLennart Poettering <lennart@poettering.net>2011-04-21 03:15:12 +0200
commit1c1890bee6b357ea963f2340fd2b2c25e70dc30d (patch)
tree55596143f3e62429ead55347d308f60a1fbf8295 /src/cryptsetup.c
parent811ad2b3a4f0a53c22ac26a19d1b3e93afcbd32f (diff)
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
Diffstat (limited to 'src/cryptsetup.c')
-rw-r--r--src/cryptsetup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cryptsetup.c b/src/cryptsetup.c
index d7c458ad8c..4ef9606d39 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;