security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-06-28 02:12:46 +02:00
Code Activity

2004-08-18 Marcus Brinkmann <marcus@g10code.de>

Browse Source 
* passphrase.c (agent_get_passphrase):
This commit is contained in:
Marcus Brinkmann 2004-08-18 00:06:08 +00:00
parent 5d98f7afe5
commit 75ac082a76
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
g10/ChangeLog
View File

@ -1,3 +1,8 @@
2004-08-18 Marcus Brinkmann <marcus@g10code.de>
* passphrase.c (agent_get_passphrase): Fix detection of gpg-agent
cancellation.
2004-08-08 David Shaw <dshaw@jabberwocky.com> 2004-08-08 David Shaw <dshaw@jabberwocky.com>
* plaintext.c (handle_plaintext): Bigger buffer for extra safety. * plaintext.c (handle_plaintext): Bigger buffer for extra safety.

8
g10/passphrase.c
View File

@ -868,9 +868,11 @@ agent_get_passphrase ( u32 *keyid, int mode, const char *tryagain_text,
m_free (orig_codeset); m_free (orig_codeset);
return pw; return pw;
} }
else if (nread > 7 && !memcmp (pw, "ERR 111", 7) else if (nread > 4 && !memcmp (pw, "ERR ", 4)
&& (pw[7] == ' ' || pw[7] == '\n') ) && (0xffff & strtoul (&pw[4], NULL, 0)) == 99)
{ {
/* 99 is GPG_ERR_CANCELED. FIXME: Check tail and overflow,
and use gpg-error. */
log_info (_("cancelled by user\n") ); log_info (_("cancelled by user\n") );
if (canceled) if (canceled)
*canceled = 1; *canceled = 1;