security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-05-24 16:43:28 +02:00
Code Activity

* app-openpgp.c (do_sign): Replace asprintf by direct allocation.

Browse Source 
This avoids problems with missing vasprintf implementations in
	gnupg 1.4.

	* app-common.h (app_openpgp_storekey: Add prototype.
This commit is contained in:
Werner Koch 2004-10-22 09:41:56 +00:00
parent 23d73cdeb8
commit 9aa7d0bc35
3 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scd/ChangeLog
View File

@ -1,3 +1,11 @@
2004-10-21 Werner Koch <wk@g10code.com>
* 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.
2004-10-20 Werner Koch <wk@g10code.com> 2004-10-20 Werner Koch <wk@g10code.com>
* sc-investigate: Removed. * sc-investigate: Removed.

7
scd/app-common.h
View File

@ -88,6 +88,13 @@ struct app_ctx_s {
#if GNUPG_MAJOR_VERSION == 1 #if GNUPG_MAJOR_VERSION == 1
int app_select_openpgp (app_t app); int app_select_openpgp (app_t app);
int app_get_serial_and_stamp (app_t app, char **serial, time_t *stamp); int app_get_serial_and_stamp (app_t app, char **serial, time_t *stamp);
int app_openpgp_storekey (app_t app, int keyno,
unsigned char *template, size_t template_len,
time_t created_at,
const unsigned char *m, size_t mlen,
const unsigned char *e, size_t elen,
int (*pincb)(void*, const char *, char **),
void *pincb_arg);
#else #else
/*-- app-help.c --*/ /*-- app-help.c --*/
gpg_error_t app_help_get_keygrip_string (ksba_cert_t cert, char *hexkeygrip); gpg_error_t app_help_get_keygrip_string (ksba_cert_t cert, char *hexkeygrip);

9
scd/app-openpgp.c
View File

@ -824,7 +824,7 @@ verify_chv3 (app_t app,
if (strlen (pinvalue) < 6) 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); " minimum length is %d\n"), 3, 6);
xfree (pinvalue); xfree (pinvalue);
return gpg_error (GPG_ERR_BAD_PIN); return gpg_error (GPG_ERR_BAD_PIN);
@ -1298,10 +1298,15 @@ do_sign (app_t app, const char *keyidstr, int hashalgo,
{ {
char *prompt; 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); return gpg_error_from_errno (errno);
sprintf (prompt, PROMPTSTRING, sigcount);
rc = pincb (pincb_arg, prompt, &pinvalue); rc = pincb (pincb_arg, prompt, &pinvalue);
free (prompt); free (prompt);
#undef PROMPTSTRING
} }
if (rc) if (rc)
{ {