mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
fixed severe format string bug
This commit is contained in:
parent
42df1779cc
commit
ca284c1000
13 changed files with 57 additions and 12 deletions
|
@ -1,3 +1,16 @@
|
|||
2001-05-25 Werner Koch <wk@gnupg.org>
|
||||
|
||||
* revoke.c (gen_revoke): Add a cast to a tty_printf arg.
|
||||
* delkey.c (do_delete_key): Ditto.
|
||||
* keyedit.c (print_and_check_one_sig): Ditto.
|
||||
(ask_revoke_sig): Ditto.
|
||||
(menu_revsig): Ditto.
|
||||
(check_all_keysigs): Removed unused arg.
|
||||
|
||||
2001-05-23 Werner Koch <wk@gnupg.org>
|
||||
|
||||
* g10.c (opts): Typo fix by Robert C. Ames.
|
||||
|
||||
2001-05-06 Werner Koch <wk@gnupg.org>
|
||||
|
||||
* revoke.c: Small typo fix
|
||||
|
|
|
@ -120,12 +120,12 @@ do_delete_key( const char *username, int secret, int *r_sec_avail )
|
|||
tty_printf("sec %4u%c/%08lX %s ",
|
||||
nbits_from_sk( sk ),
|
||||
pubkey_letter( sk->pubkey_algo ),
|
||||
keyid[1], datestr_from_sk(sk) );
|
||||
(ulong)keyid[1], datestr_from_sk(sk) );
|
||||
else
|
||||
tty_printf("pub %4u%c/%08lX %s ",
|
||||
nbits_from_pk( pk ),
|
||||
pubkey_letter( pk->pubkey_algo ),
|
||||
keyid[1], datestr_from_pk(pk) );
|
||||
(ulong)keyid[1], datestr_from_pk(pk) );
|
||||
p = get_user_id( keyid, &n );
|
||||
tty_print_utf8_string( p, n );
|
||||
m_free(p);
|
||||
|
|
|
@ -307,7 +307,7 @@ static ARGPARSE_OPTS opts[] = {
|
|||
{ oCompletesNeeded, "completes-needed", 1, "@"},
|
||||
{ oMarginalsNeeded, "marginals-needed", 1, "@"},
|
||||
{ oMaxCertDepth, "max-cert-depth", 1, "@" },
|
||||
{ oTrustedKey, "trusted-key", 2, N_("|KEYID|ulimately trust this key")},
|
||||
{ oTrustedKey, "trusted-key", 2, N_("|KEYID|ultimately trust this key")},
|
||||
{ oLoadExtension, "load-extension" ,2, N_("|FILE|load extension module FILE")},
|
||||
{ oRFC1991, "rfc1991", 0, N_("emulate the mode described in RFC1991")},
|
||||
{ oOpenPGP, "openpgp", 0, N_("set all packet, cipher and digest options to OpenPGP behavior")},
|
||||
|
|
|
@ -147,7 +147,7 @@ print_and_check_one_sig( KBNODE keyblock, KBNODE node,
|
|||
if( sigrc != '?' || print_without_key ) {
|
||||
tty_printf("%s%c %08lX %s ",
|
||||
is_rev? "rev":"sig",
|
||||
sigrc, sig->keyid[1], datestr_from_sig(sig));
|
||||
sigrc, (ulong)sig->keyid[1], datestr_from_sig(sig));
|
||||
if( sigrc == '%' )
|
||||
tty_printf("[%s] ", g10_errstr(rc) );
|
||||
else if( sigrc == '?' )
|
||||
|
@ -218,7 +218,7 @@ check_all_keysigs( KBNODE keyblock, int only_selected )
|
|||
if( !has_selfsig )
|
||||
mis_selfsig++;
|
||||
if( inv_sigs == 1 )
|
||||
tty_printf(_("1 bad signature\n"), inv_sigs );
|
||||
tty_printf(_("1 bad signature\n") );
|
||||
else if( inv_sigs )
|
||||
tty_printf(_("%d bad signatures\n"), inv_sigs );
|
||||
if( no_key == 1 )
|
||||
|
@ -1797,7 +1797,7 @@ ask_revoke_sig( KBNODE keyblock, KBNODE node )
|
|||
tty_print_utf8_string( unode->pkt->pkt.user_id->name,
|
||||
unode->pkt->pkt.user_id->len );
|
||||
tty_printf(_("\"\nsigned with your key %08lX at %s\n"),
|
||||
sig->keyid[1], datestr_from_sig(sig) );
|
||||
(ulong)sig->keyid[1], datestr_from_sig(sig) );
|
||||
|
||||
if( cpr_get_answer_is_yes("ask_revoke_sig.one",
|
||||
_("Create a revocation certificate for this signature? (y/N)")) ) {
|
||||
|
@ -1839,12 +1839,12 @@ menu_revsig( KBNODE keyblock )
|
|||
!seckey_available( sig->keyid ) ) ) {
|
||||
if( (sig->sig_class&~3) == 0x10 ) {
|
||||
tty_printf(_(" signed by %08lX at %s\n"),
|
||||
sig->keyid[1], datestr_from_sig(sig) );
|
||||
(ulong)sig->keyid[1], datestr_from_sig(sig) );
|
||||
node->flag |= NODFLG_SELSIG;
|
||||
}
|
||||
else if( sig->sig_class == 0x30 ) {
|
||||
tty_printf(_(" revoked by %08lX at %s\n"),
|
||||
sig->keyid[1], datestr_from_sig(sig) );
|
||||
(ulong)sig->keyid[1], datestr_from_sig(sig) );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -1874,7 +1874,7 @@ menu_revsig( KBNODE keyblock )
|
|||
else if( node->pkt->pkttype == PKT_SIGNATURE ) {
|
||||
sig = node->pkt->pkt.signature;
|
||||
tty_printf(_(" signed by %08lX at %s\n"),
|
||||
sig->keyid[1], datestr_from_sig(sig) );
|
||||
(ulong)sig->keyid[1], datestr_from_sig(sig) );
|
||||
}
|
||||
}
|
||||
if( !any )
|
||||
|
|
|
@ -130,7 +130,7 @@ gen_revoke( const char *uname )
|
|||
tty_printf("\nsec %4u%c/%08lX %s ",
|
||||
nbits_from_sk( sk ),
|
||||
pubkey_letter( sk->pubkey_algo ),
|
||||
sk_keyid[1], datestr_from_sk(sk) );
|
||||
(ulong)sk_keyid[1], datestr_from_sk(sk) );
|
||||
{
|
||||
size_t n;
|
||||
char *p = get_user_id( sk_keyid, &n );
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue