diff options
| author | Werner Koch <[email protected]> | 2004-10-22 09:41:56 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2004-10-22 09:41:56 +0000 |
| commit | 9aa7d0bc353daa9728bfb69a6e775ddc82075f87 (patch) | |
| tree | 20b556c54c7171aac24f345657338ca99e23cd8b /scd/app-openpgp.c | |
| parent | * logging.c (do_logv): Use set_log_stream to setup a default. (diff) | |
| download | gnupg-9aa7d0bc353daa9728bfb69a6e775ddc82075f87.tar.gz gnupg-9aa7d0bc353daa9728bfb69a6e775ddc82075f87.zip | |
* app-openpgp.c (do_sign): Replace asprintf by direct allocation.
This avoids problems with missing vasprintf implementations in
gnupg 1.4.
* app-common.h (app_openpgp_storekey: Add prototype.
Diffstat (limited to 'scd/app-openpgp.c')
| -rw-r--r-- | scd/app-openpgp.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/scd/app-openpgp.c b/scd/app-openpgp.c index d6cbe88a6..f73b4f946 100644 --- a/scd/app-openpgp.c +++ b/scd/app-openpgp.c @@ -824,7 +824,7 @@ verify_chv3 (app_t app, if (strlen (pinvalue) < 6) { - log_error (_("prassphrase (CHV%d) is too short;" + log_error (_("passphrase (CHV%d) is too short;" " minimum length is %d\n"), 3, 6); xfree (pinvalue); return gpg_error (GPG_ERR_BAD_PIN); @@ -1298,10 +1298,15 @@ do_sign (app_t app, const char *keyidstr, int hashalgo, { char *prompt; - if (asprintf (&prompt, _("PIN [sigs done: %lu]"), sigcount) < 0) +#define PROMPTSTRING _("PIN [sigs done: %lu]") + + prompt = malloc (strlen (PROMPTSTRING) + 50); + if (!prompt) return gpg_error_from_errno (errno); + sprintf (prompt, PROMPTSTRING, sigcount); rc = pincb (pincb_arg, prompt, &pinvalue); free (prompt); +#undef PROMPTSTRING } if (rc) { |