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

Fix retry if entered passphrases (with verify option) do not match.

Browse Source
This commit is contained in:
Milan Broz
2012-03-16 16:31:15 +01:00
parent 075fb8d261
commit 78cac9a97c
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -1,6 +1,7 @@
2012-03-16 Milan Broz <mbroz@redhat.com> 2012-03-16 Milan Broz <mbroz@redhat.com>
* Unify password verification option. * Unify password verification option.
* Support password verification with quiet flag if possible. (1.2.0) * Support password verification with quiet flag if possible. (1.2.0)
* Fix retry if entered passphrases (with verify option) do not match.
2012-02-11 Milan Broz <mbroz@redhat.com> 2012-02-11 Milan Broz <mbroz@redhat.com>
* Add --master-key-file option to luksOpen (open using volume key). * Add --master-key-file option to luksOpen (open using volume key).

3
lib/setup.c
View File

@@ -379,6 +379,9 @@ static int volume_key_by_terminal_passphrase(struct crypt_device *cd, int keyslo
r = key_from_terminal(cd, NULL, &passphrase_read, r = key_from_terminal(cd, NULL, &passphrase_read,
&passphrase_size_read, 0); &passphrase_size_read, 0);
/* Continue if it is just passphrase verify mismatch */
if (r == -EPERM)
continue;
if(r < 0) if(r < 0)
goto out; goto out;