security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00
Code Activity

Included LIBICONV in all Makefiles.

Browse source 
g10/
	* passphrase.c (passphrase_get): Set the cancel flag on all error
	from the agent.  Fixes a bug reported by Tom Duerbusch.
sm/
	* gpgsm.c (main): Let --gen-key print a more informative error
	message.
This commit is contained in:
Werner Koch 2007-01-31 14:24:41 +00:00
parent 7eec2efa66
commit b861561e47
50 changed files with 24909 additions and 23104 deletions
Download patch file Download diff file Expand all files Collapse all files

15
g10/passphrase.c
View file

@ -377,7 +377,18 @@ passphrase_get ( u32 *keyid, int mode, const char *cacheid,
*canceled = 1;
}
else
log_error (_("problem with the agent: %s\n"), gpg_strerror (rc));
{
log_error (_("problem with the agent: %s\n"), gpg_strerror (rc));
/* Due to limitations in the API of the upper layers they
consider an error as no passphrase entered. This works in
most cases but not during key creation where this should
definitely not happen and let it continue without requiring a
passphrase. Given that now all the upper layers handle a
cancel correctly, we simply set the cancel flag now for all
errors from the agent. */
if (canceled)
*canceled = 1;
}
#ifdef ENABLE_NLS
if (orig_codeset)
@ -483,7 +494,7 @@ ask_passphrase (const char *description,
/* Return a new DEK object Using the string-to-key sepcifier S2K. Use
KEYID and PUBKEY_ALGO to prompt the user. Returns NULL is the user
selected to cancel the passphrase entry and it CANCELED is not
selected to cancel the passphrase entry and if CANCELED is not
NULL, sets it to true.
MODE 0: Allow cached passphrase