eessppeelllloo/cryptsetup
1
0
Fork 0
mirror of https://gitlab.com/cryptsetup/cryptsetup.git synced 2025-12-12 11:20:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://cryptsetup.googlecode.com/svn/trunk@208 36d66b0a-2a48-0410-832c-cd162a569da5
This commit is contained in:
Milan Broz
2010-04-30 16:21:24 +00:00
parent 611278ca39
commit c10aff8a9d
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -3,6 +3,7 @@
* Detect old dm-crypt module and disable LUKS suspend/resume. * Detect old dm-crypt module and disable LUKS suspend/resume.
* Fix apitest to work on older systems. * Fix apitest to work on older systems.
* Allow no hash specification in plain device constructor. * 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> 2010-04-12 Milan Broz <mbroz@redhat.com>
* Fix package config to use proper package version. * Fix package config to use proper package version.

2
lib/setup.c
View File

@@ -824,7 +824,7 @@ int crypt_luksOpen(struct crypt_options *options)
if (options->flags & CRYPT_FLAG_NON_EXCLUSIVE_ACCESS) if (options->flags & CRYPT_FLAG_NON_EXCLUSIVE_ACCESS)
flags |= CRYPT_ACTIVATE_NO_UUID; 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, r = crypt_activate_by_keyfile(cd, options->name,
CRYPT_ANY_SLOT, options->key_file, options->key_size, CRYPT_ANY_SLOT, options->key_file, options->key_size,
flags); flags);