summaryrefslogtreecommitdiffstats
path: root/g10/passphrase.c
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2008-03-13 09:46:08 +0100
committerWerner Koch <wk@gnupg.org>2008-03-13 09:46:08 +0100
commit6a78bca874eefb859caf10410e8a0d3e11a49e06 (patch)
tree2ce6a8f26cc4dc62ee8787d554a386f43942177e /g10/passphrase.c
parentComment fixes. (diff)
downloadgnupg2-6a78bca874eefb859caf10410e8a0d3e11a49e06.tar.xz
gnupg2-6a78bca874eefb859caf10410e8a0d3e11a49e06.zip
Fixed an email/DN bug.
Changed pinentry prompts.
Diffstat (limited to 'g10/passphrase.c')
-rw-r--r--g10/passphrase.c10
1 files changed, 6 insertions, 4 deletions
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);
}