* decrypt.c: Fix copyright date.

* packet.h, keyedit.c (show_key_with_all_names_colon), keylist.c
(list_keyblock_colon), mainproc.c (list_node, proc_tree): Minor cleanup to
remove local_id, which is no longer used.

g10/ChangeLog

@@ -1,3 +1,11 @@
+2004-01-29  David Shaw  <dshaw@jabberwocky.com>
+
+	* decrypt.c: Fix copyright date.
+
+	* packet.h, keyedit.c (show_key_with_all_names_colon), keylist.c
+	(list_keyblock_colon), mainproc.c (list_node, proc_tree): Minor
+	cleanup to remove local_id, which is no longer used.
+
 2004-01-28  David Shaw  <dshaw@jabberwocky.com>
 
 	* g10.c (main, rm_group): Add --ungroup command to remove a

g10/decrypt.c

@@ -1,5 +1,6 @@
 /* decrypt.c - verify signed data
- * 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.
  *

g10/keyedit.c

@@ -1705,15 +1705,12 @@ show_key_with_all_names_colon (KBNODE keyblock)
 	      putchar (trust);
 	    }
 
-          printf (":%u:%d:%08lX%08lX:%lu:%lu:",
+          printf (":%u:%d:%08lX%08lX:%lu:%lu::",
                   nbits_from_pk (pk),
                   pk->pubkey_algo,
                   (ulong)keyid[0], (ulong)keyid[1],
                   (ulong)pk->timestamp,
                   (ulong)pk->expiredate );
-          if (pk->local_id)
-            printf ("%lu", pk->local_id);
-          putchar (':');
           if (node->pkt->pkttype==PKT_PUBLIC_KEY
 	      && !(opt.fast_list_mode || opt.no_expensive_trust_checks ))
 	    putchar(get_ownertrust_info (pk));

g10/keylist.c

@@ -697,15 +697,12 @@ list_keyblock_colon( KBNODE keyblock, int secret, int fpr )
                 ulti_hack = 1;
             putchar(trustletter);
         }
-        printf(":%u:%d:%08lX%08lX:%s:%s:",
+        printf(":%u:%d:%08lX%08lX:%s:%s::",
 		    nbits_from_pk( pk ),
 		    pk->pubkey_algo,
 		    (ulong)keyid[0],(ulong)keyid[1],
 		    colon_datestr_from_pk( pk ),
 		    colon_strtime (pk->expiredate) );
-        if( pk->local_id )
-            printf("%lu", pk->local_id );
-        putchar(':');
         if( !opt.fast_list_mode && !opt.no_expensive_trust_checks  )
             putchar( get_ownertrust_info(pk) );
 	    putchar(':');
@@ -806,7 +803,7 @@ list_keyblock_colon( KBNODE keyblock, int secret, int fpr )
 	        if(trustletter)
 		  printf("%c", trustletter );
             }
-            printf(":%u:%d:%08lX%08lX:%s:%s:",
+            printf(":%u:%d:%08lX%08lX:%s:%s:::::",
 			nbits_from_pk( pk2 ),
 			pk2->pubkey_algo,
 			(ulong)keyid2[0],(ulong)keyid2[1],
@@ -814,12 +811,6 @@ list_keyblock_colon( KBNODE keyblock, int secret, int fpr )
 			colon_strtime (pk2->expiredate)
 			/* fixme: add LID and ownertrust here */
 						);
-            if( pk->local_id ) /* use the local_id of the main key??? */
-                printf("%lu", pk->local_id );
-            putchar(':');
-            putchar(':');
-            putchar(':');
-            putchar(':');
             print_capabilities (pk2, NULL, NULL);
             putchar('\n');
 	    if( fpr > 1 )

g10/mainproc.c

@@ -70,7 +70,6 @@ struct mainproc_context {
     int have_data;
     IOBUF iobuf;    /* used to get the filename etc. */
     int trustletter; /* temp usage in list_node */
-    ulong local_id;    /* ditto */
     ulong symkeys;
     struct kidlist_item *pkenc_list;	/* list of encryption packets */
     struct {
@@ -858,23 +857,18 @@ list_node( CTX c, KBNODE node )
 	if( opt.with_colons ) {
 	    u32 keyid[2];
 	    keyid_from_pk( pk, keyid );
-	    if( mainkey ) {
+	    if( mainkey )
-		c->local_id = pk->local_id;
+	      c->trustletter = opt.fast_list_mode?
-		c->trustletter = opt.fast_list_mode?
 					   0 : get_validity_info( pk, NULL );
-	    }
 	    printf("%s:", mainkey? "pub":"sub" );
 	    if( c->trustletter )
 		putchar( c->trustletter );
-	    printf(":%u:%d:%08lX%08lX:%s:%s:",
+	    printf(":%u:%d:%08lX%08lX:%s:%s::",
 		    nbits_from_pk( pk ),
 		    pk->pubkey_algo,
 		    (ulong)keyid[0],(ulong)keyid[1],
 		    colon_datestr_from_pk( pk ),
 		    colon_strtime (pk->expiredate) );
-	    if( c->local_id )
-		printf("%lu", c->local_id );
-	    putchar(':');
 	    if( mainkey && !opt.fast_list_mode )
                  putchar( get_ownertrust_info (pk) );
 	    putchar(':');
@@ -1610,7 +1604,6 @@ proc_tree( CTX c, KBNODE node )
     if (!node)
         return;
 
-    c->local_id = 0;
     c->trustletter = ' ';
     if( node->pkt->pkttype == PKT_PUBLIC_KEY
 	|| node->pkt->pkttype == PKT_PUBLIC_SUBKEY ) {

g10/packet.h

@@ -122,7 +122,6 @@ struct revocation_key {
 };
 
 typedef struct {
-    ulong   local_id;	    /* internal use, valid if > 0 */
     struct {
 	unsigned checked:1; /* signature has been checked */
 	unsigned valid:1;   /* signature is good (if checked is set) */
@@ -205,7 +204,6 @@ typedef struct {
 			       without the key to check it */
     int     is_valid;       /* key (especially subkey) is valid */
     int     dont_cache;     /* do not cache this */
-    ulong   local_id;	    /* internal use, valid if > 0 */
     u32     main_keyid[2];  /* keyid of the primary key */
     u32     keyid[2];	    /* calculated by keyid_from_pk() */
     byte    is_primary;