diff options
| author | Werner Koch <[email protected]> | 2010-06-24 10:51:30 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2010-06-24 10:51:30 +0000 |
| commit | c8bafe218c9ecf2bddef8d67753778afa8d9d30c (patch) | |
| tree | d33f9589db631d060447e09ac64ee2f70d9d9e41 /agent | |
| parent | Remove cruft. (diff) | |
| download | gnupg-c8bafe218c9ecf2bddef8d67753778afa8d9d30c.tar.gz gnupg-c8bafe218c9ecf2bddef8d67753778afa8d9d30c.zip | |
Fix a regression from 2010-06-09.
Diffstat (limited to 'agent')
| -rw-r--r-- | agent/ChangeLog | 5 | ||||
| -rw-r--r-- | agent/genkey.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/agent/ChangeLog b/agent/ChangeLog index e0b8b8d10..c4aa1c299 100644 --- a/agent/ChangeLog +++ b/agent/ChangeLog @@ -1,3 +1,8 @@ +2010-06-24 Werner Koch <[email protected]> + + * genkey.c (check_passphrase_pattern): Use HANG option for + gnupg_wait_progress. Fixes regression from 2010-06-09. + 2010-06-21 Werner Koch <[email protected]> * protect-tool.c (export_p12_file, import_p12_cert_cb) diff --git a/agent/genkey.c b/agent/genkey.c index 7c6b44b96..b064c98ed 100644 --- a/agent/genkey.c +++ b/agent/genkey.c @@ -129,7 +129,7 @@ check_passphrase_pattern (ctrl_t ctrl, const char *pw) if (gnupg_spawn_process_fd (pgmname, argv, fileno (infp), -1, -1, &pid)) result = 1; /* Execute error - assume password should no be used. */ - else if (gnupg_wait_process (pgmname, pid, 0, NULL)) + else if (gnupg_wait_process (pgmname, pid, 1, NULL)) result = 1; /* Helper returned an error - probably a match. */ else result = 0; /* Success; i.e. no match. */ |