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

* misc.c (compress_algo_to_string): Return NULL on failure like all of the

Browse source 
other xxxx_algo_to_string() functions.

* mainproc.c (list_node): Minor spacing tweak to match --list-keys output.

* keylist.c (list_keyblock_print), mainproc.c (list_node): Mark revoked
subkeys as revoked.  Requested by Matthew Wilcox.  Make revoked and
expired tags translatable (they are already translated elsewhere).
Revoked overrides expiration when both apply.

* keyedit.c (show_prefs): Use compress algo constants.
(show_basic_key_info): Make revoked and expired tags translatable
(show_key_with_all_names): Revoked overrides expired when both apply.
This commit is contained in:
David Shaw 2004-02-10 03:38:15 +00:00
parent d0a1aaa277
commit 8890842012
5 changed files with 53 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

18
g10/ChangeLog
View file

@ -1,3 +1,21 @@
2004-02-09 David Shaw <dshaw@jabberwocky.com>
* misc.c (compress_algo_to_string): Return NULL on failure like
all of the other xxxx_algo_to_string() functions.
* mainproc.c (list_node): Minor spacing tweak to match --list-keys
output.
* keylist.c (list_keyblock_print), mainproc.c (list_node): Mark
revoked subkeys as revoked. Requested by Matthew Wilcox. Make
revoked and expired tags translatable (they are already translated
elsewhere). Revoked overrides expiration when both apply.
* keyedit.c (show_prefs): Use compress algo constants.
(show_basic_key_info): Make revoked and expired tags translatable
(show_key_with_all_names): Revoked overrides expired when both
apply.
2004-02-06 David Shaw <dshaw@jabberwocky.com> 2004-02-06 David Shaw <dshaw@jabberwocky.com>
* getkey.c (merge_selfsigs_main): Properly handle expired user IDs * getkey.c (merge_selfsigs_main): Properly handle expired user IDs

18
g10/keyedit.c
View file

@ -1,6 +1,6 @@
/* keyedit.c - keyedit stuff /* keyedit.c - keyedit stuff
* Copyright (C) 1998, 1999, 2000, 2001, 2002, * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003,
* 2003 Free Software Foundation, Inc. * 2004 Free Software Foundation, Inc.
* *
* This file is part of GnuPG. * This file is part of GnuPG.
* *
@ -1626,7 +1626,7 @@ show_prefs (PKT_user_id *uid, int verbose)
tty_printf ("%s", s ); tty_printf ("%s", s );
else else
tty_printf ("[%d]", prefs[i].value); tty_printf ("[%d]", prefs[i].value);
if (prefs[i].value == 0 ) if (prefs[i].value == COMPRESS_ALGO_NONE )
uncomp_seen = 1; uncomp_seen = 1;
} }
} }
@ -1634,10 +1634,10 @@ show_prefs (PKT_user_id *uid, int verbose)
if (any) if (any)
tty_printf (", "); tty_printf (", ");
else { else {
tty_printf ("%s",compress_algo_to_string(1)); tty_printf ("%s",compress_algo_to_string(COMPRESS_ALGO_ZIP));
tty_printf (", "); tty_printf (", ");
} }
tty_printf ("%s",compress_algo_to_string(0)); tty_printf ("%s",compress_algo_to_string(COMPRESS_ALGO_NONE));
} }
if(uid->mdc_feature) if(uid->mdc_feature)
{ {
@ -1954,7 +1954,7 @@ show_key_with_all_names( KBNODE keyblock, int only_marked, int with_revoker,
tty_printf("(%d) ", i); tty_printf("(%d) ", i);
if ( uid->is_revoked ) if ( uid->is_revoked )
tty_printf (_("[revoked] ")); tty_printf (_("[revoked] "));
if ( uid->is_expired ) else if ( uid->is_expired )
tty_printf (_("[expired] ")); tty_printf (_("[expired] "));
tty_print_utf8_string( uid->name, uid->len ); tty_print_utf8_string( uid->name, uid->len );
tty_printf("\n"); tty_printf("\n");
@ -2036,9 +2036,9 @@ show_basic_key_info ( KBNODE keyblock )
tty_printf (" "); tty_printf (" ");
if (uid->is_revoked) if (uid->is_revoked)
tty_printf ("[revoked] "); tty_printf (_("[revoked] "));
if ( uid->is_expired ) else if ( uid->is_expired )
tty_printf ("[expired] "); tty_printf (_("[expired] "));
tty_print_utf8_string (uid->name, uid->len); tty_print_utf8_string (uid->name, uid->len);
tty_printf ("\n"); tty_printf ("\n");
} }

14
g10/keylist.c
View file

@ -489,8 +489,8 @@ list_keyblock_print ( KBNODE keyblock, int secret, int fpr, void *opaque )
printf("uid%*s", 28, ""); printf("uid%*s", 28, "");
if ( node->pkt->pkt.user_id->is_revoked ) if ( node->pkt->pkt.user_id->is_revoked )
fputs ("[revoked] ", stdout); fputs (_("[revoked] "), stdout);
if ( node->pkt->pkt.user_id->is_expired ) else if ( node->pkt->pkt.user_id->is_expired )
fputs ("[expired] ", stdout); fputs ("[expired] ", stdout);
print_utf8_string( stdout, node->pkt->pkt.user_id->name, print_utf8_string( stdout, node->pkt->pkt.user_id->name,
node->pkt->pkt.user_id->len ); node->pkt->pkt.user_id->len );
@ -523,9 +523,15 @@ list_keyblock_print ( KBNODE keyblock, int secret, int fpr, void *opaque )
pubkey_letter( pk2->pubkey_algo ), pubkey_letter( pk2->pubkey_algo ),
(ulong)keyid2[1], (ulong)keyid2[1],
datestr_from_pk( pk2 ) ); datestr_from_pk( pk2 ) );
if( pk2->expiredate ) { /* Yes, this is an odd way to print the revoked string,
but we already have translations for "[revoked] " (with
the trailing space) and this is a simple way to take
advantage of it. In devel, this will be done rather
more elegantly. */
if( pk2->is_revoked )
printf(" %s",_("[revoked] "));
else if( pk2->expiredate )
printf(_(" [expires: %s]"), expirestr_from_pk( pk2 ) ); printf(_(" [expires: %s]"), expirestr_from_pk( pk2 ) );
}
putchar('\n'); putchar('\n');
if( fpr > 1 ) if( fpr > 1 )
print_fingerprint( pk2, NULL, 0 ); print_fingerprint( pk2, NULL, 0 );

20
g10/mainproc.c
View file

@ -1,6 +1,6 @@
/* mainproc.c - handle packets /* mainproc.c - handle packets
* Copyright (C) 1998, 1999, 2000, 2001, 2002, * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003,
* 2003 Free Software Foundation, Inc. * 2004 Free Software Foundation, Inc.
* *
* This file is part of GnuPG. * This file is part of GnuPG.
* *
@ -881,12 +881,13 @@ list_node( CTX c, KBNODE node )
} }
} }
else else
printf("%s %4u%c/%08lX %s ", printf("%s %4u%c/%08lX %s%s",
mainkey? "pub":"sub", mainkey? "pub":"sub",
nbits_from_pk( pk ), nbits_from_pk( pk ),
pubkey_letter( pk->pubkey_algo ), pubkey_letter( pk->pubkey_algo ),
(ulong)keyid_from_pk( pk, NULL ), (ulong)keyid_from_pk( pk, NULL ),
datestr_from_pk( pk ) ); datestr_from_pk( pk ),
mainkey?" ":"");
if( mainkey ) { if( mainkey ) {
/* and now list all userids with their signatures */ /* and now list all userids with their signatures */
@ -931,9 +932,14 @@ list_node( CTX c, KBNODE node )
} }
} }
} }
else if( pk->expiredate ) { /* of subkey */ else
printf(_(" [expires: %s]"), expirestr_from_pk( pk ) ); {
} /* of subkey */
if( pk->is_revoked )
printf(" %s",_("[revoked] "));
else if( pk->expiredate )
printf(_(" [expires: %s]"), expirestr_from_pk( pk ) );
}
if( !any ) if( !any )
putchar('\n'); putchar('\n');

5
g10/misc.c
View file

@ -1,5 +1,6 @@
/* misc.c - miscellaneous functions /* misc.c - miscellaneous functions
* Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003
* 2004 Free Software Foundation, Inc.
* *
* This file is part of GnuPG. * This file is part of GnuPG.
* *
@ -542,7 +543,7 @@ deprecated_warning(const char *configname,unsigned int configlineno,
const char * const char *
compress_algo_to_string(int algo) compress_algo_to_string(int algo)
{ {
const char *s="?"; const char *s=NULL;
switch(algo) switch(algo)
{ {