From c10aff8a9d9e0687108d6fd33dfecfe272f021ca Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Fri, 30 Apr 2010 16:21:24 +0000 Subject: [PATCH] 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 --- ChangeLog | 1 + lib/setup.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index a7c7d148..fafe590b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 * Fix package config to use proper package version. diff --git a/lib/setup.c b/lib/setup.c index df03588a..6ac6c967 100644 --- a/lib/setup.c +++ b/lib/setup.c @@ -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);