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

* keygen.c (keygen_set_std_prefs): Build the default preferences list at

Browse source 
runtime as it properly handles algorithms disabled at build or run time.

* getkey.c (merge_selfsigs_main): Properly handle expired user IDs when
the expired self-sig is not the only self-sig.

* 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.  Revoked overrides
expiration when both apply.

* keyedit.c (show_prefs): Use compress algo constants.
(show_basic_key_info): Make revoked and expired tags translatable.

* g10.c (rm_group): Properly ungroup from a list of groups.
This commit is contained in:
David Shaw 2004-02-10 22:42:34 +00:00
parent 74eadbf99b
commit 9842d84da0
8 changed files with 110 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

16
g10/keyedit.c
View file

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