aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--scd/ChangeLog5
-rw-r--r--scd/app-openpgp.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/scd/ChangeLog b/scd/ChangeLog
index 6c7830a7a..7d4370ad0 100644
--- a/scd/ChangeLog
+++ b/scd/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-30 Werner Koch <[email protected]>
+
+ * app-openpgp.c (verify_a_chv): Use xtrymalloc and make the prompt
+ for CHV2 more user friendly.
+
2008-07-03 Werner Koch <[email protected]>
* app-openpgp.c (do_readcert): New.
diff --git a/scd/app-openpgp.c b/scd/app-openpgp.c
index 2eecc9df3..cfc51ce45 100644
--- a/scd/app-openpgp.c
+++ b/scd/app-openpgp.c
@@ -1412,7 +1412,7 @@ verify_a_chv (app_t app,
#define PROMPTSTRING _("||Please enter the PIN%%0A[sigs done: %lu]")
size_t promptsize = strlen (PROMPTSTRING) + 50;
- prompt = xmalloc (promptsize);
+ prompt = xtrymalloc (promptsize);
if (!prompt)
return gpg_error_from_syserror ();
snprintf (prompt, promptsize-1, PROMPTSTRING, sigcount);
@@ -1421,7 +1421,7 @@ verify_a_chv (app_t app,
#undef PROMPTSTRING
}
else
- rc = pincb (pincb_arg, "PIN", pinvalue);
+ rc = pincb (pincb_arg, _("||Please enter the PIN"), pinvalue);
if (rc)
{