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

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.

1 files changed, 13 insertions, 7 deletions

diff --git a/g10/mainproc.c b/g10/mainproc.c
index 1f95d80b9..bca9240e7 100644
--- a/g10/mainproc.c
+++ b/g10/mainproc.c
@@ -1,6 +1,6 @@
 /* mainproc.c - handle packets
- * 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.
  *
@@ -866,12 +866,13 @@ list_node( CTX c, KBNODE node )
 	    }
 	}
 	else
-	    printf("%s  %4u%c/%08lX %s ",
+	    printf("%s  %4u%c/%08lX %s%s",
 				      mainkey? "pub":"sub",
 				      nbits_from_pk( pk ),
 				      pubkey_letter( pk->pubkey_algo ),
 				      (ulong)keyid_from_pk( pk, NULL ),
-				      datestr_from_pk( pk )	);
+				      datestr_from_pk( pk ),
+		                      mainkey?" ":"");
 
 	if( mainkey ) {
 	    /* and now list all userids with their signatures */
@@ -916,9 +917,14 @@ list_node( CTX c, KBNODE node )
 		}
 	    }
 	}
-	else if( pk->expiredate ) { /* of subkey */
-	    printf(_(" [expires: %s]"), expirestr_from_pk( pk ) );
-	}
+	else
+	  {
+	    /* of subkey */
+	    if( pk->is_revoked )
+	      printf(" %s",_("[revoked] "));
+	    else if( pk->expiredate )
+	      printf(_(" [expires: %s]"), expirestr_from_pk( pk ) );
+	  }
 
 	if( !any )
 	    putchar('\n');