Fix luksFormat/luksOpen reading passphrase from stdin and "-" keyfile.

git-svn-id: https://cryptsetup.googlecode.com/svn/trunk@237 36d66b0a-2a48-0410-832c-cd162a569da5
This commit is contained in:
Milan Broz
2010-05-27 18:44:00 +00:00
parent 205d62af89
commit 231ab0167b
4 changed files with 23 additions and 2 deletions

View File

@@ -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 && strcmp(options->key_file, "-"))
if (options->key_file)
r = crypt_activate_by_keyfile(cd, options->name,
CRYPT_ANY_SLOT, options->key_file, options->key_size,
flags);