... and previous reintroduce it as debug message.
authorMilan Broz <gmazyland@gmail.com>
Mon, 28 Sep 2009 18:50:05 +0000 (18:50 +0000)
committerMilan Broz <gmazyland@gmail.com>
Mon, 28 Sep 2009 18:50:05 +0000 (18:50 +0000)
(The problem is when repeated passphrase input is tried on pipe,
it should not show "error reading passphrase", because it fails
for the second reading attepmt anyway but should retain
error message saying "no key with this passpharase...")

git-svn-id: https://cryptsetup.googlecode.com/svn/trunk@117 36d66b0a-2a48-0410-832c-cd162a569da5

lib/utils.c

index c498a60..d23619e 100644 (file)
@@ -493,8 +493,10 @@ void get_key(char *prompt, char **key, unsigned int *passLen, int key_size,
                if(key_file)
                        close(fd);
                /* Fail if piped input dies reading nothing */
-               if(!i && !regular_file)
+               if(!i && !regular_file) {
+                       log_dbg("Error reading passphrase.");
                        goto out_err;
+               }
                pass[i] = 0;
                *key = pass;
                *passLen = i;