From 6a78bca874eefb859caf10410e8a0d3e11a49e06 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Thu, 13 Mar 2008 08:46:08 +0000 Subject: Fixed an email/DN bug. Changed pinentry prompts. --- g10/ChangeLog | 5 +++++ g10/passphrase.c | 10 ++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) (limited to 'g10') diff --git a/g10/ChangeLog b/g10/ChangeLog index f4deed471..ac769b76a 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,8 @@ +2008-03-13 Werner Koch + + * passphrase.c (PROMPTSTRING): Change string to me more similar to + the X.509 prompt. + 2008-02-26 Werner Koch * getkey.c (get_pubkey_byname): Fix comment. diff --git a/g10/passphrase.c b/g10/passphrase.c index cf67b7f9f..8703580dc 100644 --- a/g10/passphrase.c +++ b/g10/passphrase.c @@ -306,10 +306,11 @@ passphrase_get ( u32 *keyid, int mode, const char *cacheid, #undef KEYIDSTRING -#define PROMPTSTRING _("You need a passphrase to unlock the secret" \ - " key for user:\n" \ +#define PROMPTSTRING _("Please enter the passphrase to unlock the" \ + " secret key for the OpenPGP certificate:\n" \ "\"%.*s\"\n" \ - "%u-bit %s key, ID %s, created %s%s\n" ) + "%u-bit %s key, ID %s,\n" \ + "created %s%s.\n" ) atext = xmalloc ( 100 + strlen (PROMPTSTRING) + uidlen + 15 + strlen(algo_name) + keystrlen() @@ -448,7 +449,8 @@ ask_passphrase (const char *description, { if (strchr (description, '%')) { - char *tmp = unescape_percent_string (description); + char *tmp = unescape_percent_string + ((const unsigned char*)description); tty_printf ("\n%s\n", tmp); xfree (tmp); } -- cgit v1.2.3