Commit c10aff8a authored by Milan Broz's avatar Milan Broz

Fix luksOpen reading of passphrase on stdin (if "-" keyfile specified) (Issue 52)

git-svn-id: https://cryptsetup.googlecode.com/svn/trunk@208 36d66b0a-2a48-0410-832c-cd162a569da5
parent 611278ca
......@@ -3,6 +3,7 @@
* Detect old dm-crypt module and disable LUKS suspend/resume.
* Fix apitest to work on older systems.
* Allow no hash specification in plain device constructor.
* Fix luksOpen reading of passphrase on stdin (if "-" keyfile specified).
2010-04-12 Milan Broz <mbroz@redhat.com>
* Fix package config to use proper package version.
......
......@@ -824,7 +824,7 @@ int crypt_luksOpen(struct crypt_options *options)
if (options->flags & CRYPT_FLAG_NON_EXCLUSIVE_ACCESS)
flags |= CRYPT_ACTIVATE_NO_UUID;
if (options->key_file)
if (options->key_file && strcmp(options->key_file, "-"))
r = crypt_activate_by_keyfile(cd, options->name,
CRYPT_ANY_SLOT, options->key_file, options->key_size,
flags);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment