[svn] GnuPG - r4803 - trunk/scd

[svn author wk]

Author: wk
Date: 2008-07-30 12:25:18 +0200 (Wed, 30 Jul 2008)
New Revision: 4803

Modified:
   trunk/scd/ChangeLog
   trunk/scd/app-openpgp.c
Log:
prompt change.


Modified: trunk/scd/ChangeLog
===================================================================
--- trunk/scd/ChangeLog	2008-07-21 07:38:53 UTC (rev 4802)
+++ trunk/scd/ChangeLog	2008-07-30 10:25:18 UTC (rev 4803)
@@ -1,3 +1,8 @@
+2008-07-30  Werner Koch  <wk at g10code.com>
+
+	* app-openpgp.c (verify_a_chv): Use xtrymalloc and make the prompt
+	for CHV2 more user friendly.
+
 2008-07-03  Werner Koch  <wk at g10code.com>
 
 	* app-openpgp.c (do_readcert): New.

Modified: trunk/scd/app-openpgp.c
===================================================================
--- trunk/scd/app-openpgp.c	2008-07-21 07:38:53 UTC (rev 4802)
+++ trunk/scd/app-openpgp.c	2008-07-30 10:25:18 UTC (rev 4803)
@@ -1412,7 +1412,7 @@
 #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 @@
 #undef PROMPTSTRING
         }
       else
-        rc = pincb (pincb_arg, "PIN", pinvalue); 
+        rc = pincb (pincb_arg, _("||Please enter the PIN"), pinvalue); 
 
       if (rc)
         {