security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-03 22:56:33 +02:00
Code Activity

* configure.ac: Remove the check for asprintf

Browse source 
* app-common.h (app_openpgp_storekey: Add prototype.

* app-openpgp.c (do_sign): Replace asprintf by direct allocation.
This avoids problems with missing vasprintf implementations.

* card-util.c (generate_card_keys): Add a #warning for gnupg 1.9
and use the same string there.

* util.h [!HAVE_VASPRINTF]: Removed prototype.

* vasprintf.c: Removed. It was used only at one place and I don't
want to get into build problems in 1.4.
This commit is contained in:
Werner Koch 2004-10-21 16:56:22 +00:00
parent 107e515aa9
commit 0ebf79c824
12 changed files with 47 additions and 183 deletions
Download patch file Download diff file Expand all files Collapse all files

10
g10/ChangeLog
View file

@ -1,3 +1,13 @@
2004-10-21 Werner Koch <wk@g10code.com>
* app-common.h (app_openpgp_storekey: Add prototype.
* app-openpgp.c (do_sign): Replace asprintf by direct allocation.
This avoids problems with missing vasprintf implementations.
* card-util.c (generate_card_keys): Add a #warning for gnupg 1.9
and use the same string there.
2004-10-20 David Shaw <dshaw@jabberwocky.com>
* g10.c (parse_list_options): Fix non-constant initializer so we

7
g10/app-common.h
View file

@ -88,6 +88,13 @@ struct app_ctx_s {
#if GNUPG_MAJOR_VERSION == 1
int app_select_openpgp (app_t app);
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
/*-- app-help.c --*/
gpg_error_t app_help_get_keygrip_string (ksba_cert_t cert, char *hexkeygrip);

7
g10/app-openpgp.c
View file

@ -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)
{

6
g10/card-util.c
View file

@ -895,10 +895,10 @@ generate_card_keys (const char *serialno)
m_free(answer);
}
#else
/* Does 1.9 have answer_is_yes_no_default() ? */
want_backup = !(cpr_get_answer_is_yes
want_backup = cpr_get_answer_is_yes
( "cardedit.genkeys.backup_enc",
_("Inhibit off-card backup of encryption key? (y/N) ")));
_("Make off-card backup of encryption key? (Y/n) "));
#warning we need answer_is_yes_no_default()
#endif
if ( (info.fpr1valid && !fpr_is_zero (info.fpr1))