Converted all m_free to xfree etc.
[gnupg.git] / g10 / keylist.c
index 8969187..b5ba537 100644 (file)
@@ -1,5 +1,6 @@
 /* keylist.c
- *     Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003,
+ *               2004, 2005 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -15,7 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
 #include "packet.h"
 #include "errors.h"
 #include "keydb.h"
-#include <gcrypt.h>
+#include "memory.h"
+#include "photoid.h"
 #include "util.h"
+#include "ttyio.h"
 #include "trustdb.h"
 #include "main.h"
 #include "i18n.h"
+#include "status.h"
 
 static void list_all(int);
 static void list_one( STRLIST names, int secret);
-static void list_keyblock( KBNODE keyblock, int secret );
-static void fingerprint( PKT_public_key *pk, PKT_secret_key *sk );
+static void print_card_serialno (PKT_secret_key *sk);
 
+struct sig_stats
+{
+  int inv_sigs;
+  int no_key;
+  int oth_err;
+};
+
+static FILE *attrib_fp=NULL;
 
 /****************
  * List the keys
@@ -48,138 +60,420 @@ static void fingerprint( PKT_public_key *pk, PKT_secret_key *sk );
 void
 public_key_list( STRLIST list )
 {
-    if( !list )
-       list_all(0);
-    else
-       list_one( list, 0 );
+  if(opt.with_colons)
+    {
+      byte trust_model,marginals,completes,cert_depth;
+      ulong created,nextcheck;
+
+      read_trust_options(&trust_model,&created,&nextcheck,
+                        &marginals,&completes,&cert_depth);
+
+      printf("tru:");
+
+      if(nextcheck && nextcheck <= make_timestamp())
+       printf("o");
+      if(trust_model!=opt.trust_model)
+       printf("t");
+      if(opt.trust_model==TM_PGP || opt.trust_model==TM_CLASSIC)
+       {
+         if(marginals!=opt.marginals_needed)
+           printf("m");
+         if(completes!=opt.completes_needed)
+           printf("c");
+         if(cert_depth!=opt.max_cert_depth)
+           printf("d");
+       }
+
+      printf(":%d:%lu:%lu",trust_model,created,nextcheck);
+
+      /* Only show marginals, completes, and cert_depth in the classic
+        or PGP trust models since they are not meaningful
+        otherwise. */
+
+      if(trust_model==TM_PGP || trust_model==TM_CLASSIC)
+       printf(":%d:%d:%d",marginals,completes,cert_depth);
+
+      printf("\n");
+    }
+
+  /* We need to do the stale check right here because it might need to
+     update the keyring while we already have the keyring open.  This
+     is very bad for W32 because of a sharing violation. For real OSes
+     it might lead to false results if we are later listing a keyring
+     which is associated with the inode of a deleted file.  */
+  check_trustdb_stale ();
+
+  if( !list )
+    list_all(0);
+  else
+    list_one( list, 0 );
 }
 
 void
 secret_key_list( STRLIST list )
 {
+    check_trustdb_stale ();
+
     if( !list )
        list_all(1);
     else  /* List by user id */
        list_one( list, 1 );
 }
 
+void
+print_seckey_info (PKT_secret_key *sk)
+{
+  u32 keyid[2];
+  char *p;
+
+  keyid_from_sk (sk, keyid);
+  p=get_user_id_native(keyid);
 
-static void
-list_all( int secret )
+  tty_printf ("\nsec  %4u%c/%s %s %s\n",
+             nbits_from_sk (sk),
+             pubkey_letter (sk->pubkey_algo),
+             keystr(keyid), datestr_from_sk (sk), p);
+    
+  xfree (p);
+}
+
+/* Print information about the public key.  With FP passed as NULL,
+   the tty output interface is used, otherwise output is directted to
+   the given stream. */
+void
+print_pubkey_info (FILE *fp, PKT_public_key *pk)
 {
-    KBPOS kbpos;
-    KBNODE keyblock = NULL;
-    int rc=0;
-    int lastresno;
+  u32 keyid[2];
+  char *p;
 
-    rc = enum_keyblocks_begin( &kbpos, secret );
-    if( rc ) {
-       if( rc != -1 )
-           log_error("enum_keyblocks(open) failed: %s\n", gpg_errstr(rc) );
-       goto leave;
-    }
+  keyid_from_pk (pk, keyid);
 
-    lastresno = -1;
-    while( !(rc = enum_keyblocks_next( kbpos, 1, &keyblock )) ) {
-       if( 1 /*lastresno != kbpos.resno FIXME!!! */ ) {
-           const char *s = "foo" /*keyblock_resource_name( &kbpos ) */;
-           int i;
+  /* If the pk was chosen by a particular user ID, that is the one to
+     print. */
+  if(pk->user_id)
+    p=utf8_to_native(pk->user_id->name,pk->user_id->len,0);
+  else
+    p=get_user_id_native(keyid);
 
-           /* FIXME lastresno = kbpos.resno*/
-           printf("%s\n", s );
-           for(i=strlen(s); i; i-- )
-               putchar('-');
-           putchar('\n');
-       }
-       merge_keys_and_selfsig( keyblock );
-       list_keyblock( keyblock, secret );
-       release_kbnode( keyblock ); keyblock = NULL;
+  if (fp)
+    fprintf (fp, "pub  %4u%c/%s %s %s\n",
+             nbits_from_pk (pk),
+             pubkey_letter (pk->pubkey_algo),
+             keystr(keyid), datestr_from_pk (pk), p);
+  else
+    tty_printf ("\npub  %4u%c/%s %s %s\n",
+                nbits_from_pk (pk), pubkey_letter (pk->pubkey_algo),
+                keystr(keyid), datestr_from_pk (pk), p);
+
+  xfree (p);
+}
+
+
+/* Print basic information of a secret key including the card serial
+   number information. */
+void
+print_card_key_info (FILE *fp, KBNODE keyblock)
+{
+  KBNODE node;
+  int i;
+
+  for (node = keyblock; node; node = node->next ) 
+    {
+      if (node->pkt->pkttype == PKT_SECRET_KEY
+          || (node->pkt->pkttype == PKT_SECRET_SUBKEY) )
+        {
+          PKT_secret_key *sk = node->pkt->pkt.secret_key;
+          
+          tty_fprintf (fp, "%s%c  %4u%c/%s  ",
+                      node->pkt->pkttype == PKT_SECRET_KEY? "sec":"ssb",
+                       (sk->protect.s2k.mode==1001)?'#':
+                       (sk->protect.s2k.mode==1002)?'>':' ',
+                      nbits_from_sk (sk),
+                      pubkey_letter (sk->pubkey_algo),
+                      keystr_from_sk(sk));
+          tty_fprintf (fp, _("created: %s"), datestr_from_sk (sk));
+          tty_fprintf (fp, "  ");
+          tty_fprintf (fp, _("expires: %s"), expirestr_from_sk (sk));
+          if (sk->is_protected && sk->protect.s2k.mode == 1002)
+            {
+              tty_fprintf (fp, "\n                      ");
+              tty_fprintf (fp, _("card-no: ")); 
+              if (sk->protect.ivlen == 16
+                  && !memcmp (sk->protect.iv, "\xD2\x76\x00\x01\x24\x01", 6))
+                { 
+                  /* This is an OpenPGP card. */
+                  for (i=8; i < 14; i++)
+                    {
+                      if (i == 10)
+                        tty_fprintf (fp, " ");
+                      tty_fprintf (fp, "%02X", sk->protect.iv[i]);
+                    }
+                }
+              else
+                { /* Something is wrong: Print all. */
+                  for (i=0; i < sk->protect.ivlen; i++)
+                    tty_fprintf (fp, "%02X", sk->protect.iv[i]);
+                }
+            }
+          tty_fprintf (fp, "\n");
+        }
     }
+}
 
-    if( rc && rc != -1 )
-       log_error("enum_keyblocks(read) failed: %s\n", gpg_errstr(rc));
 
-  leave:
-    enum_keyblocks_end( kbpos ); 
-    release_kbnode( keyblock );
+
+/* Flags = 0x01 hashed 0x02 critical */
+static void
+status_one_subpacket(sigsubpkttype_t type,size_t len,int flags,const byte *buf)
+{
+  char status[40];
+
+  /* Don't print these. */
+  if(len>256)
+    return;
+
+  sprintf(status,"%d %u %u ",type,flags,(unsigned int)len);
+
+  write_status_text_and_buffer(STATUS_SIG_SUBPACKET,status,buf,len,0);
 }
 
+/*
+  mode=0 for stdout.
+  mode=1 for log_info + status messages
+  mode=2 for status messages only
+*/
 
-/****************
- * Check whether the user ID at NODE is valid; that is it has a
- * valid self-signature but no later valid revocation.
- * Caller has to pass the keyID of the primary in mainkey.
- * Returns: NULL = valid
- *         string with the reason why it is invalid
- */
-static const char *
-is_uid_valid ( KBNODE keyblock, KBNODE uidnode, u32 *mainkid )
+void
+show_policy_url(PKT_signature *sig,int indent,int mode)
 {
-    KBNODE node;
-    PKT_signature *selfsig = NULL; /* the latest valid self signature */
-
-    /* The key signature verify function can's handle secret keys yet and
-     * becuase we are not sure whether the duplication of user IDs and
-     * self-signatures should be kept on secret keys we are not going to fix
-     * it there. */
-    if ( keyblock->pkt->pkttype == PKT_SECRET_KEY )
-       return NULL;
-
-    assert ( uidnode->pkt->pkttype == PKT_USER_ID
-            || uidnode->pkt->pkttype == PKT_PHOTO_ID );
-
-    /* first find out about the latest valid self-signature */
-    for ( node = uidnode->next; node; node = node->next ) {
-       PKT_signature *sig;
-
-       if ( node->pkt->pkttype == PKT_USER_ID
-            || node->pkt->pkttype == PKT_PHOTO_ID
-            || node->pkt->pkttype == PKT_PUBLIC_SUBKEY
-            || node->pkt->pkttype == PKT_SECRET_SUBKEY )
-           break;
-       if ( node->pkt->pkttype != PKT_SIGNATURE )
-           continue;
-       sig = node->pkt->pkt.signature;
-       if ( mainkid[0] != sig->keyid[0] || mainkid[1] != sig->keyid[1] )
-           continue; /* we only care about self-signatures for now */
-
-       if ( (sig->sig_class&~3) == 0x10 ) { /* regular self signature */
-           if ( !check_key_signature( keyblock, node, NULL ) ) {
-               if ( !selfsig )
-                   selfsig = sig; /* use the first valid sig */
-               else if ( sig->timestamp > selfsig->timestamp
-                         && sig->sig_class >= selfsig->sig_class )
-                   selfsig = sig; /* but this one is newer */
-           }
+  const byte *p;
+  size_t len;
+  int seq=0,crit;
+  FILE *fp=mode?log_stream():stdout;
+
+  while((p=enum_sig_subpkt(sig->hashed,SIGSUBPKT_POLICY,&len,&seq,&crit)))
+    {
+      if(mode!=2)
+       {
+         int i;
+         const char *str;
+
+         for(i=0;i<indent;i++)
+           putchar(' ');
+
+         if(crit)
+           str=_("Critical signature policy: ");
+         else
+           str=_("Signature policy: ");
+         if(mode)
+           log_info("%s",str);
+         else
+           printf("%s",str);
+         print_utf8_string(fp,p,len);
+         fprintf(fp,"\n");
        }
+
+      if(mode)
+       write_status_buffer ( STATUS_POLICY_URL, p, len, 0 );
     }
+}
 
-    if ( !selfsig )
-       return _("invalid"); /* no valid self signature */
+/*
+  mode=0 for stdout.
+  mode=1 for log_info + status messages
+  mode=2 for status messages only
+*/
+/* TODO: use this */
+void
+show_keyserver_url(PKT_signature *sig,int indent,int mode)
+{
+  const byte *p;
+  size_t len;
+  int seq=0,crit;
+  FILE *fp=mode?log_stream():stdout;
 
-    /* watch out for a newer revocation */
-    for ( node = uidnode->next; node; node = node->next ) {
-       PKT_signature *sig;
+  while((p=enum_sig_subpkt(sig->hashed,SIGSUBPKT_PREF_KS,&len,&seq,&crit)))
+    {
+      if(mode!=2)
+       {
+         int i;
+         const char *str;
 
-       if ( node->pkt->pkttype == PKT_USER_ID
-            || node->pkt->pkttype == PKT_PHOTO_ID
-            || node->pkt->pkttype == PKT_PUBLIC_SUBKEY
-            || node->pkt->pkttype == PKT_SECRET_SUBKEY )
-           break;
-       if ( node->pkt->pkttype != PKT_SIGNATURE )
-           continue;
-       sig = node->pkt->pkt.signature;
-       if ( mainkid[0] != sig->keyid[0] || mainkid[1] != sig->keyid[1] )
-           continue; /* we only care about self-signatures for now */
-
-       if ( sig->sig_class == 0x30
-            && sig->timestamp >= selfsig->timestamp ) {
-           if ( !check_key_signature( keyblock, node, NULL ) )
-               return _("revoked");
+         for(i=0;i<indent;i++)
+           putchar(' ');
+
+         if(crit)
+           str=_("Critical preferred keyserver: ");
+         else
+           str=_("Preferred keyserver: ");
+         if(mode)
+           log_info("%s",str);
+         else
+           printf("%s",str);
+         print_utf8_string(fp,p,len);
+         fprintf(fp,"\n");
        }
+
+      if(mode)
+       status_one_subpacket(SIGSUBPKT_PREF_KS,len,(crit?0x02:0)|0x01,p);
     }
+}
+
+/*
+  mode=0 for stdout.
+  mode=1 for log_info + status messages
+  mode=2 for status messages only
+
+  which bits:
+  1 == standard notations
+  2 == user notations
+*/
+
+void
+show_notation(PKT_signature *sig,int indent,int mode,int which)
+{
+  const byte *p;
+  size_t len;
+  int seq=0,crit;
+  FILE *fp=mode?log_stream():stdout;
 
-    return NULL; /* UID is valid */
+  if(which==0)
+    which=3;
+
+  /* There may be multiple notations in the same sig. */
+
+  while((p=enum_sig_subpkt(sig->hashed,SIGSUBPKT_NOTATION,&len,&seq,&crit)))
+    if(len>=8)
+      {
+       int n1,n2;
+
+       n1=(p[4]<<8)|p[5];
+       n2=(p[6]<<8)|p[7];
+
+       if(8+n1+n2!=len)
+         {
+           log_info(_("WARNING: invalid notation data found\n"));
+           continue;
+         }
+
+       if(mode!=2)
+         {
+           int has_at=!!memchr(p+8,'@',n1);
+
+           if((which&1 && !has_at) || (which&2 && has_at))
+             {
+               int i;
+               const char *str;
+
+               for(i=0;i<indent;i++)
+                 putchar(' ');
+
+               /* This is UTF8 */
+               if(crit)
+                 str=_("Critical signature notation: ");
+               else
+                 str=_("Signature notation: ");
+               if(mode)
+                 log_info("%s",str);
+               else
+                 printf("%s",str);
+               print_utf8_string(fp,p+8,n1);
+               fprintf(fp,"=");
+
+               if(*p&0x80)
+                 print_utf8_string(fp,p+8+n1,n2);
+               else
+                 fprintf(fp,"[ %s ]",_("not human readable"));
+
+               fprintf(fp,"\n");
+             }
+         }
+
+       if(mode)
+         {
+           write_status_buffer ( STATUS_NOTATION_NAME, p+8   , n1, 0 );
+           write_status_buffer ( STATUS_NOTATION_DATA, p+8+n1, n2, 50 );
+         }
+      }
+  else
+    log_info(_("WARNING: invalid notation data found\n"));
+}
+
+static void
+print_signature_stats(struct sig_stats *s)
+{
+  if( s->inv_sigs == 1 )
+    tty_printf(_("1 bad signature\n") );
+  else if( s->inv_sigs )
+    tty_printf(_("%d bad signatures\n"), s->inv_sigs );
+  if( s->no_key == 1 )
+    tty_printf(_("1 signature not checked due to a missing key\n") );
+  else if( s->no_key )
+    tty_printf(_("%d signatures not checked due to missing keys\n"),s->no_key);
+  if( s->oth_err == 1 )
+    tty_printf(_("1 signature not checked due to an error\n") );
+  else if( s->oth_err )
+    tty_printf(_("%d signatures not checked due to errors\n"), s->oth_err );
+}
+
+static void
+list_all( int secret )
+{
+    KEYDB_HANDLE hd;
+    KBNODE keyblock = NULL;
+    int rc=0;
+    const char *lastresname, *resname;
+    struct sig_stats stats;
+
+    memset(&stats,0,sizeof(stats));
+
+    hd = keydb_new (secret);
+    if (!hd)
+        rc = G10ERR_GENERAL;
+    else
+        rc = keydb_search_first (hd);
+    if( rc ) {
+       if( rc != -1 )
+           log_error("keydb_search_first failed: %s\n", g10_errstr(rc) );
+       goto leave;
+    }
+
+    lastresname = NULL;
+    do {
+        rc = keydb_get_keyblock (hd, &keyblock);
+        if (rc) {
+            log_error ("keydb_get_keyblock failed: %s\n", g10_errstr(rc));
+            goto leave;
+        }
+       if(!opt.with_colons)
+         {
+           resname = keydb_get_resource_name (hd);
+           if (lastresname != resname )
+             {
+               int i;
+
+               printf("%s\n", resname );
+               for(i=strlen(resname); i; i-- )
+                 putchar('-');
+               putchar('\n');
+               lastresname = resname;
+             }
+         }
+        merge_keys_and_selfsig( keyblock );
+       list_keyblock( keyblock, secret, opt.fingerprint,
+                      opt.check_sigs?&stats:NULL);
+       release_kbnode( keyblock ); 
+        keyblock = NULL;
+    } while (!(rc = keydb_search_next (hd)));
+    if( rc && rc != -1 )
+       log_error ("keydb_search_next failed: %s\n", g10_errstr(rc));
+
+    if(opt.check_sigs && !opt.with_colons)
+      print_signature_stats(&stats);
+
+  leave:
+    release_kbnode (keyblock);
+    keydb_release (hd);
 }
 
 
@@ -189,17 +483,38 @@ list_one( STRLIST names, int secret )
     int rc = 0;
     KBNODE keyblock = NULL;
     GETKEY_CTX ctx;
+    const char *resname;
+    const char *keyring_str = _("Keyring");
+    int i;
+    struct sig_stats stats;
 
+    memset(&stats,0,sizeof(stats));
+
+    /* fixme: using the bynames function has the disadvantage that we
+     * don't know wether one of the names given was not found.  OTOH,
+     * this function has the advantage to list the names in the
+     * sequence as defined by the keyDB and does not duplicate
+     * outputs.  A solution could be do test whether all given have
+     * been listed (this needs a way to use the keyDB search
+     * functions) or to have the search function return indicators for
+     * found names.  Yet another way is to use the keydb search
+     * facilities directly. */
     if( secret ) {
        rc = get_seckey_bynames( &ctx, NULL, names, &keyblock );
        if( rc ) {
-           log_error("error reading key: %s\n",  gpg_errstr(rc) );
+           log_error("error reading key: %s\n",  g10_errstr(rc) );
            get_seckey_end( ctx );
            return;
        }
        do {
-           merge_keys_and_selfsig( keyblock );
-           list_keyblock( keyblock, 1 );
+           if ((opt.list_options&LIST_SHOW_KEYRING) && !opt.with_colons) {
+               resname = keydb_get_resource_name (get_ctx_handle(ctx));
+               printf("%s: %s\n", keyring_str, resname);
+               for(i = strlen(resname) + strlen(keyring_str) + 2; i; i-- )
+                   putchar('-');
+               putchar('\n');
+           }
+           list_keyblock( keyblock, 1, opt.fingerprint, NULL );
            release_kbnode( keyblock );
        } while( !get_seckey_next( ctx, NULL, &keyblock ) );
        get_seckey_end( ctx );
@@ -207,36 +522,496 @@ list_one( STRLIST names, int secret )
     else {
        rc = get_pubkey_bynames( &ctx, NULL, names, &keyblock );
        if( rc ) {
-           log_error("error reading key: %s\n", gpg_errstr(rc) );
+           log_error("error reading key: %s\n", g10_errstr(rc) );
            get_pubkey_end( ctx );
            return;
        }
        do {
-           merge_keys_and_selfsig( keyblock );
-           list_keyblock( keyblock, 0 );
+         if ((opt.list_options&LIST_SHOW_KEYRING) && !opt.with_colons) {
+               resname = keydb_get_resource_name (get_ctx_handle(ctx));
+               printf("%s: %s\n", keyring_str, resname);
+               for(i = strlen(resname) + strlen(keyring_str) + 2; i; i-- )
+                   putchar('-');
+               putchar('\n');
+           }
+           list_keyblock( keyblock, 0, opt.fingerprint,
+                          opt.check_sigs?&stats:NULL );
            release_kbnode( keyblock );
        } while( !get_pubkey_next( ctx, NULL, &keyblock ) );
        get_pubkey_end( ctx );
     }
+
+    if(opt.check_sigs && !opt.with_colons)
+      print_signature_stats(&stats);
 }
 
 static void
-print_key_data( PKT_public_key *pk, u32 *keyid )
+print_key_data( PKT_public_key *pk )
 {
     int n = pk ? pubkey_get_npkey( pk->pubkey_algo ) : 0;
     int i;
 
     for(i=0; i < n; i++ ) {
-       printf("pkd:%d:%u:", i, gcry_mpi_get_nbits( pk->pkey[i] ) );
+       printf("pkd:%d:%u:", i, mpi_get_nbits( pk->pkey[i] ) );
        mpi_print(stdout, pk->pkey[i], 1 );
        putchar(':');
        putchar('\n');
     }
 }
 
+static void
+print_capabilities (PKT_public_key *pk, PKT_secret_key *sk, KBNODE keyblock)
+{
+  if(pk || (sk && sk->protect.s2k.mode!=1001))
+    {
+      unsigned int use = pk? pk->pubkey_usage : sk->pubkey_usage;
+    
+      if ( use & PUBKEY_USAGE_ENC )
+        putchar ('e');
+
+      if ( use & PUBKEY_USAGE_SIG )
+       {
+         putchar ('s');
+         if( pk? pk->is_primary : sk->is_primary )
+           putchar ('c');
+       }
+
+      if ( (use & PUBKEY_USAGE_AUTH) )
+        putchar ('a');
+    }
+
+    if ( keyblock ) { /* figure out the usable capabilities */
+        KBNODE k;
+        int enc=0, sign=0, cert=0, auth=0, disabled=0;
+
+        for (k=keyblock; k; k = k->next ) {
+            if ( k->pkt->pkttype == PKT_PUBLIC_KEY 
+                 || k->pkt->pkttype == PKT_PUBLIC_SUBKEY ) {
+                pk = k->pkt->pkt.public_key;
+
+               if(pk->is_primary)
+                 disabled=pk_is_disabled(pk);
+
+                if ( pk->is_valid && !pk->is_revoked && !pk->has_expired ) {
+                    if ( pk->pubkey_usage & PUBKEY_USAGE_ENC )
+                        enc = 1;
+                    if ( pk->pubkey_usage & PUBKEY_USAGE_SIG )
+                     {
+                       sign = 1;
+                       if(pk->is_primary)
+                         cert = 1;
+                     }
+                    if ( (pk->pubkey_usage & PUBKEY_USAGE_AUTH) )
+                      auth = 1;
+                }
+            }
+            else if ( k->pkt->pkttype == PKT_SECRET_KEY 
+                      || k->pkt->pkttype == PKT_SECRET_SUBKEY ) {
+                sk = k->pkt->pkt.secret_key;
+                if ( sk->is_valid && !sk->is_revoked && !sk->has_expired
+                    && sk->protect.s2k.mode!=1001 ) {
+                    if ( sk->pubkey_usage & PUBKEY_USAGE_ENC )
+                        enc = 1;
+                    if ( sk->pubkey_usage & PUBKEY_USAGE_SIG )
+                     {
+                       sign = 1;
+                       if(sk->is_primary)
+                         cert = 1;
+                     }
+                    if ( (sk->pubkey_usage & PUBKEY_USAGE_AUTH) )
+                        auth = 1;
+                }
+            }
+        }
+        if (enc)
+            putchar ('E');
+        if (sign)
+            putchar ('S');
+        if (cert)
+            putchar ('C');
+        if (auth)
+            putchar ('A');
+        if (disabled)
+            putchar ('D');
+    }
+
+    putchar(':');
+}
+
+/* Flags = 0x01 hashed 0x02 critical */
+static void
+print_one_subpacket(sigsubpkttype_t type,size_t len,int flags,const byte *buf)
+{
+  size_t i;
+
+  printf("spk:%d:%u:%u:",type,flags,(unsigned int)len);
+
+  for(i=0;i<len;i++)
+    {
+      /* printable ascii other than : and % */
+      if(buf[i]>=32 && buf[i]<=126 && buf[i]!=':' && buf[i]!='%')
+       printf("%c",buf[i]);
+      else
+       printf("%%%02X",buf[i]);
+    }
+
+  printf("\n");
+}
+
+void
+print_subpackets_colon(PKT_signature *sig)
+{
+  byte *i;
+
+  assert(opt.show_subpackets);
+
+  for(i=opt.show_subpackets;*i;i++)
+    {
+      const byte *p;
+      size_t len;
+      int seq,crit;
+
+      seq=0;
+
+      while((p=enum_sig_subpkt(sig->hashed,*i,&len,&seq,&crit)))
+       print_one_subpacket(*i,len,0x01|(crit?0x02:0),p);
+
+      seq=0;
+
+      while((p=enum_sig_subpkt(sig->unhashed,*i,&len,&seq,&crit)))
+       print_one_subpacket(*i,len,0x00|(crit?0x02:0),p);
+    }
+}
+
+void
+dump_attribs(const PKT_user_id *uid,PKT_public_key *pk,PKT_secret_key *sk)
+{
+  int i;
+
+  if(!attrib_fp)
+    return;
+
+  for(i=0;i<uid->numattribs;i++)
+    {
+      if(is_status_enabled())
+       {
+         byte array[MAX_FINGERPRINT_LEN], *p;
+         char buf[(MAX_FINGERPRINT_LEN*2)+90];
+         size_t j,n;
+
+         if(pk)
+           fingerprint_from_pk( pk, array, &n );
+         else if(sk)
+           fingerprint_from_sk( sk, array, &n );
+         else
+           BUG();
+
+         p = array;
+         for(j=0; j < n ; j++, p++ )
+           sprintf(buf+2*j, "%02X", *p );
+
+         sprintf(buf+strlen(buf)," %lu %u %u %u %lu %lu %u",
+                 (ulong)uid->attribs[i].len,uid->attribs[i].type,i+1,
+                 uid->numattribs,(ulong)uid->created,(ulong)uid->expiredate,
+                 ((uid->is_primary?0x01:0)|
+                  (uid->is_revoked?0x02:0)|
+                  (uid->is_expired?0x04:0)));
+         write_status_text(STATUS_ATTRIBUTE,buf);
+       }
+
+      fwrite(uid->attribs[i].data,uid->attribs[i].len,1,attrib_fp);
+    }
+}
+
+static void
+list_keyblock_print ( KBNODE keyblock, int secret, int fpr, void *opaque )
+{
+    int rc = 0;
+    KBNODE kbctx;
+    KBNODE node;
+    PKT_public_key *pk;
+    PKT_secret_key *sk;
+    struct sig_stats *stats=opaque;
+    int skip_sigs=0;
+
+    /* get the keyid from the keyblock */
+    node = find_kbnode( keyblock, secret? PKT_SECRET_KEY : PKT_PUBLIC_KEY );
+    if( !node ) {
+       log_error("Oops; key lost!\n");
+       dump_kbnode( keyblock );
+       return;
+    }
+
+    if( secret )
+      {
+       pk = NULL;
+       sk = node->pkt->pkt.secret_key;
+
+        printf("sec%c  %4u%c/%s %s",(sk->protect.s2k.mode==1001)?'#':
+              (sk->protect.s2k.mode==1002)?'>':' ',
+              nbits_from_sk( sk ),pubkey_letter( sk->pubkey_algo ),
+              keystr_from_sk(sk),datestr_from_sk( sk ));
+
+       if(sk->has_expired)
+         {
+           printf(" [");
+           printf(_("expired: %s"),expirestr_from_sk(sk));
+           printf("]");
+         }
+       else if(sk->expiredate )
+         {
+           printf(" [");
+           printf(_("expires: %s"),expirestr_from_sk(sk));
+           printf("]");
+         }
+
+       printf("\n");
+      }
+    else
+      {
+       pk = node->pkt->pkt.public_key;
+       sk = NULL;
+
+       check_trustdb_stale();
+
+       printf("pub   %4u%c/%s %s",
+              nbits_from_pk(pk),pubkey_letter(pk->pubkey_algo),
+              keystr_from_pk(pk),datestr_from_pk( pk ));
+
+       /* We didn't include this before in the key listing, but there
+          is room in the new format, so why not? */
+
+       if(pk->is_revoked)
+         {
+           printf(" [");
+           printf(_("revoked: %s"),revokestr_from_pk(pk));
+           printf("]");
+         }
+       else if(pk->has_expired)
+         {
+           printf(" [");
+           printf(_("expired: %s"),expirestr_from_pk(pk));
+           printf("]");
+         }
+       else if(pk->expiredate)
+         {
+           printf(" [");
+           printf(_("expires: %s"),expirestr_from_pk(pk));
+           printf("]");
+         }
+
+#if 0
+       /* I need to think about this some more.  It's easy enough to
+          include, but it looks sort of confusing in the
+          listing... */
+       if(opt.list_options&LIST_SHOW_VALIDITY)
+         {
+           int validity=get_validity(pk,NULL);
+           printf(" [%s]",trust_value_to_string(validity));
+         }
+#endif
+
+       printf("\n");
+      }
+
+    if( fpr )
+      print_fingerprint( pk, sk, 0 );
+    print_card_serialno (sk);
+    if( opt.with_key_data )
+      print_key_data( pk );
+
+    for( kbctx=NULL; (node=walk_kbnode( keyblock, &kbctx, 0)) ; ) {
+       if( node->pkt->pkttype == PKT_USER_ID && !opt.fast_list_mode ) {
+           PKT_user_id *uid=node->pkt->pkt.user_id;
+
+           if(pk && (uid->is_expired || uid->is_revoked)
+              && !(opt.list_options&LIST_SHOW_UNUSABLE_UIDS))
+             {
+               skip_sigs=1;
+               continue;
+             }
+           else
+             skip_sigs=0;
+
+           if(attrib_fp && uid->attrib_data!=NULL)
+             dump_attribs(uid,pk,sk);
+
+           if((uid->is_revoked || uid->is_expired)
+              || ((opt.list_options&LIST_SHOW_UID_VALIDITY) && pk))
+             {
+               const char *validity;
+               int indent;
+
+               validity=uid_trust_string_fixed(pk,uid);
+               indent=(keystrlen()+9)-atoi(uid_trust_string_fixed(NULL,NULL));
+
+               if(indent<0 || indent>40)
+                 indent=0;
+
+               printf("uid%*s%s ",indent,"",validity);
+             }
+           else
+             printf("uid%*s", (int)keystrlen()+10,"");
+
+            print_utf8_string( stdout, uid->name, uid->len );
+           putchar('\n');
+
+           if((opt.list_options&LIST_SHOW_PHOTOS) && uid->attribs!=NULL)
+             show_photos(uid->attribs,uid->numattribs,pk,sk);
+       }
+       else if( node->pkt->pkttype == PKT_PUBLIC_SUBKEY )
+         {
+           PKT_public_key *pk2 = node->pkt->pkt.public_key;
+
+           if((pk2->is_revoked || pk2->has_expired)
+              && !(opt.list_options&LIST_SHOW_UNUSABLE_SUBKEYS))
+             {
+               skip_sigs=1;
+               continue;
+             }
+           else
+             skip_sigs=0;
+
+            printf("sub   %4u%c/%s %s",
+                  nbits_from_pk( pk2 ),pubkey_letter( pk2->pubkey_algo ),
+                  keystr_from_pk(pk2),datestr_from_pk(pk2));
+           if( pk2->is_revoked )
+             {
+               printf(" [");
+               printf(_("revoked: %s"),revokestr_from_pk(pk2));
+               printf("]");
+             }
+           else if( pk2->has_expired )
+             {
+               printf(" [");
+               printf(_("expired: %s"),expirestr_from_pk(pk2));
+               printf("]");
+             }
+           else if( pk2->expiredate )
+             {
+               printf(" [");
+               printf(_("expires: %s"),expirestr_from_pk(pk2));
+               printf("]");
+             }
+            putchar('\n');
+           if( fpr > 1 )
+             print_fingerprint( pk2, NULL, 0 );
+           if( opt.with_key_data )
+             print_key_data( pk2 );
+         }
+       else if( node->pkt->pkttype == PKT_SECRET_SUBKEY )
+         {
+           PKT_secret_key *sk2 = node->pkt->pkt.secret_key;
+
+            printf("ssb%c  %4u%c/%s %s",
+                   (sk2->protect.s2k.mode==1001)?'#':
+                   (sk2->protect.s2k.mode==1002)?'>':' ',
+                  nbits_from_sk( sk2 ),pubkey_letter( sk2->pubkey_algo ),
+                  keystr_from_sk(sk2),datestr_from_sk( sk2 ) );
+            if( sk2->expiredate )
+             {
+               printf(" [");
+               printf(_("expires: %s"),expirestr_from_sk(sk2));
+               printf("]");
+             }
+           putchar('\n');
+           if( fpr > 1 )
+              {
+                print_fingerprint( NULL, sk2, 0 );
+                print_card_serialno (sk2);
+              }
+         }
+       else if( opt.list_sigs
+                && node->pkt->pkttype == PKT_SIGNATURE
+                && !skip_sigs ) {
+           PKT_signature *sig = node->pkt->pkt.signature;
+           int sigrc;
+            char *sigstr;
+
+           if( stats ) {
+                /*fflush(stdout);*/
+               rc = check_key_signature( keyblock, node, NULL );
+               switch( rc ) {
+                case 0:                 sigrc = '!'; break;
+                case G10ERR_BAD_SIGN:   stats->inv_sigs++; sigrc = '-'; break;
+                case G10ERR_NO_PUBKEY: 
+                case G10ERR_UNU_PUBKEY: stats->no_key++; continue;
+                default:                stats->oth_err++; sigrc = '%'; break;
+               }
+
+               /* TODO: Make sure a cached sig record here still has
+                   the pk that issued it.  See also
+                   keyedit.c:print_and_check_one_sig */
+           }
+           else {
+               rc = 0;
+               sigrc = ' ';
+           }
+
+           if( sig->sig_class == 0x20 || sig->sig_class == 0x28
+                                      || sig->sig_class == 0x30 )
+              sigstr = "rev";
+           else if( (sig->sig_class&~3) == 0x10 )
+              sigstr = "sig";
+           else if( sig->sig_class == 0x18 )
+              sigstr = "sig";
+           else if( sig->sig_class == 0x1F )
+              sigstr = "sig";
+           else {
+                printf("sig                             "
+                      "[unexpected signature class 0x%02x]\n",sig->sig_class );
+               continue;
+           }
+
+            fputs( sigstr, stdout );
+           printf("%c%c %c%c%c%c%c%c %s %s",
+                   sigrc,(sig->sig_class-0x10>0 &&
+                          sig->sig_class-0x10<4)?'0'+sig->sig_class-0x10:' ',
+                   sig->flags.exportable?' ':'L',
+                   sig->flags.revocable?' ':'R',
+                   sig->flags.policy_url?'P':' ',
+                   sig->flags.notation?'N':' ',
+                   sig->flags.expired?'X':' ',
+                  (sig->trust_depth>9)?'T':
+                  (sig->trust_depth>0)?'0'+sig->trust_depth:' ',
+                  keystr(sig->keyid),datestr_from_sig(sig));
+           if(opt.list_options&LIST_SHOW_SIG_EXPIRE)
+             printf(" %s", expirestr_from_sig(sig));
+           printf("  ");
+           if( sigrc == '%' )
+               printf("[%s] ", g10_errstr(rc) );
+           else if( sigrc == '?' )
+               ;
+           else if ( !opt.fast_list_mode ) {
+               size_t n;
+               char *p = get_user_id( sig->keyid, &n );
+                print_utf8_string( stdout, p, n );
+               xfree(p);
+           }
+           putchar('\n');
+
+           if(sig->flags.policy_url
+              && (opt.list_options&LIST_SHOW_POLICY_URLS))
+             show_policy_url(sig,3,0);
+
+           if(sig->flags.notation && (opt.list_options&LIST_SHOW_NOTATIONS))
+             show_notation(sig,3,0,
+                           ((opt.list_options&LIST_SHOW_STD_NOTATIONS)?1:0)+
+                           ((opt.list_options&LIST_SHOW_USER_NOTATIONS)?2:0));
+
+           if(sig->flags.pref_ks
+              && (opt.list_options&LIST_SHOW_KEYSERVER_URLS))
+             show_keyserver_url(sig,3,0);
+
+           /* fixme: check or list other sigs here */
+       }
+    }
+    putchar('\n');
+}
+
 
 static void
-list_keyblock( KBNODE keyblock, int secret )
+list_keyblock_colon( KBNODE keyblock, int secret, int fpr )
 {
     int rc = 0;
     KBNODE kbctx;
@@ -247,6 +1022,7 @@ list_keyblock( KBNODE keyblock, int secret )
     int any=0;
     int trustletter = 0;
     int ulti_hack = 0;
+    int i;
 
     /* get the keyid from the keyblock */
     node = find_kbnode( keyblock, secret? PKT_SECRET_KEY : PKT_PUBLIC_KEY );
@@ -260,100 +1036,128 @@ list_keyblock( KBNODE keyblock, int secret )
        pk = NULL;
        sk = node->pkt->pkt.secret_key;
        keyid_from_sk( sk, keyid );
-       if( opt.with_colons )
-           printf("sec:u:%u:%d:%08lX%08lX:%s:%s:::",
+        printf("sec::%u:%d:%08lX%08lX:%s:%s:::",
                    nbits_from_sk( sk ),
                    sk->pubkey_algo,
                    (ulong)keyid[0],(ulong)keyid[1],
-                   datestr_from_sk( sk ),
-                   sk->expiredate? strtimestamp(sk->expiredate):""
+                   colon_datestr_from_sk( sk ),
+                   colon_strtime (sk->expiredate)
                    /* fixme: add LID here */ );
-       else
-           printf("sec  %4u%c/%08lX %s ", nbits_from_sk( sk ),
-                                      pubkey_letter( sk->pubkey_algo ),
-                                      (ulong)keyid[1],
-                                      datestr_from_sk( sk ) );
     }
     else {
        pk = node->pkt->pkt.public_key;
        sk = NULL;
        keyid_from_pk( pk, keyid );
-       if( opt.with_colons ) {
-           if ( opt.fast_list_mode ) {
-               fputs( "pub::", stdout );
-               trustletter = 0;
-           }
-           else {
-               trustletter = query_trust_info( pk, NULL );
-               if( trustletter == 'u' )
-                   ulti_hack = 1;
-               printf("pub:%c:", trustletter );
-           }
-           printf("%u:%d:%08lX%08lX:%s:%s:",
+        fputs( "pub:", stdout );
+        if ( !pk->is_valid )
+            putchar ('i');
+        else if ( pk->is_revoked )
+            putchar ('r');
+        else if ( pk->has_expired )
+            putchar ('e');
+        else if ( opt.fast_list_mode || opt.no_expensive_trust_checks ) 
+            ;
+        else {
+            trustletter = get_validity_info ( pk, NULL );
+            if( trustletter == 'u' )
+                ulti_hack = 1;
+            putchar(trustletter);
+        }
+        printf(":%u:%d:%08lX%08lX:%s:%s::",
                    nbits_from_pk( pk ),
                    pk->pubkey_algo,
                    (ulong)keyid[0],(ulong)keyid[1],
-                   datestr_from_pk( pk ),
-                   pk->expiredate? strtimestamp(pk->expiredate):"" );
-           if( pk->local_id )
-               printf("%lu", pk->local_id );
-           putchar(':');
-           if( pk->local_id && !opt.fast_list_mode )
-               putchar( get_ownertrust_info( pk->local_id ) );
+                   colon_datestr_from_pk( pk ),
+                   colon_strtime (pk->expiredate) );
+        if( !opt.fast_list_mode && !opt.no_expensive_trust_checks  )
+            putchar( get_ownertrust_info(pk) );
            putchar(':');
-       }
-       else
-           printf("pub  %4u%c/%08lX %s ", nbits_from_pk( pk ),
-                                      pubkey_letter( pk->pubkey_algo ),
-                                      (ulong)keyid[1],
-                                      datestr_from_pk( pk ) );
+    }
+    
+    if (opt.fixed_list_mode) {
+        /* do not merge the first uid with the primary key */
+        putchar(':');
+        putchar(':');
+        print_capabilities (pk, sk, keyblock);
+        if (secret) {
+          putchar(':'); /* End of field 13. */
+          putchar(':'); /* End of field 14. */
+          if (sk->protect.s2k.mode == 1001)
+            putchar('#'); /* Key is just a stub. */
+          else if (sk->protect.s2k.mode == 1002) {
+            /* Key is stored on an external token (card) or handled by
+               the gpg-agent.  Print the serial number of that token
+               here. */
+            for (i=0; i < sk->protect.ivlen; i++)
+              printf ("%02X", sk->protect.iv[i]);
+          }
+          putchar(':'); /* End of field 15. */
+        }
+        putchar('\n');
+        if( fpr )
+            print_fingerprint( pk, sk, 0 );
+        if( opt.with_key_data )
+            print_key_data( pk );
+        any = 1;
     }
 
+
     for( kbctx=NULL; (node=walk_kbnode( keyblock, &kbctx, 0)) ; ) {
        if( node->pkt->pkttype == PKT_USER_ID && !opt.fast_list_mode ) {
+           PKT_user_id *uid=node->pkt->pkt.user_id;
+           if(attrib_fp && node->pkt->pkt.user_id->attrib_data!=NULL)
+             dump_attribs(node->pkt->pkt.user_id,pk,sk);
+            /*
+             * Fixme: We need a is_valid flag here too 
+             */
            if( any ) {
-               if ( opt.with_colons ) {
-                   byte namehash[20];
-
-                   if( pk && !ulti_hack ) {
-                       if( node->pkt->pkt.user_id->photo ) {
-                           gcry_md_hash_buffer( GCRY_MD_RMD160, namehash,
-                                           node->pkt->pkt.user_id->name,
-                                           node->pkt->pkt.user_id->len  );
-                       }
-                       else {
-                           gcry_md_hash_buffer( GCRY_MD_RMD160, namehash,
-                                           node->pkt->pkt.user_id->name,
-                                           node->pkt->pkt.user_id->len  );
-                       }
-                       trustletter = query_trust_info( pk, namehash );
-                   }
+               char *str=uid->attrib_data?"uat":"uid";
+               /* If we're listing a secret key, leave out the
+                  validity values for now.  This is handled better in
+                  1.9. */
+               if ( sk )
+                   printf("%s:::::",str);
+                else if ( uid->is_revoked )
+                   printf("%s:r::::",str);
+                else if ( uid->is_expired )
+                   printf("%s:e::::",str);
+               else if ( opt.no_expensive_trust_checks )
+                   printf("%s:::::",str);
+                else {
+                   int uid_validity;
+
+                   if( pk && !ulti_hack )
+                     uid_validity=get_validity_info (pk, uid);
                    else
-                       trustletter = 'u';
-                   printf("uid:%c::::::::", trustletter);
-               }
-               else
-                   printf("uid%*s", 28, "");
-           }
-           if( opt.with_colons ) {
-               print_string( stdout,  node->pkt->pkt.user_id->name,
-                             node->pkt->pkt.user_id->len, ':' );
-               putchar(':');
-           }
-           else {
-               const char *s = is_uid_valid ( keyblock, node, keyid );
-               if ( s )
-                   printf ("[%s] ", s );
-               print_utf8_string( stdout,  node->pkt->pkt.user_id->name,
-                                  node->pkt->pkt.user_id->len );
-           }
+                       uid_validity = 'u';
+                   printf("%s:%c::::",str,uid_validity);
+                }
 
-           putchar('\n');
-           if( !any ) {
-               if( opt.fingerprint )
-                   fingerprint( pk, sk );
+               printf("%s:",colon_strtime(uid->created));
+               printf("%s:",colon_strtime(uid->expiredate));
+
+               namehash_from_uid(uid);
+
+               for(i=0; i < 20; i++ )
+                 printf("%02X",uid->namehash[i]);
+
+               printf("::");
+           }
+           if(uid->attrib_data)
+             printf("%u %lu",uid->numattribs,uid->attrib_len);
+            else
+             print_string(stdout,uid->name,uid->len, ':' );
+            putchar(':');
+           if (any)
+                putchar('\n');
+            else {
+                putchar(':');
+                print_capabilities (pk, sk, keyblock);
+                putchar('\n');
+               if( fpr )
+                   print_fingerprint( pk, sk, 0 );
                if( opt.with_key_data )
-                   print_key_data( pk, keyid );
+                   print_key_data( pk );
                any = 1;
            }
        }
@@ -362,97 +1166,111 @@ list_keyblock( KBNODE keyblock, int secret )
            PKT_public_key *pk2 = node->pkt->pkt.public_key;
 
            if( !any ) {
-               putchar('\n');
-               if( opt.fingerprint )
-                   fingerprint( pk, sk ); /* of the main key */
+                putchar(':');
+                putchar(':');
+                print_capabilities (pk, sk, keyblock);
+                putchar('\n');
+               if( fpr )
+                   print_fingerprint( pk, sk, 0 ); /* of the main key */
                any = 1;
            }
 
-
-
            keyid_from_pk( pk2, keyid2 );
-           if( opt.with_colons ) {
-               if ( opt.fast_list_mode ) {
-                   fputs( "sub::", stdout );
-               }
-               else {
-                   printf("sub:%c:", trustletter );
-               }
-               printf("%u:%d:%08lX%08lX:%s:%s:",
+            fputs ("sub:", stdout );
+            if ( !pk2->is_valid )
+                putchar ('i');
+            else if ( pk2->is_revoked )
+                putchar ('r');
+            else if ( pk2->has_expired )
+                putchar ('e');
+            else if ( opt.fast_list_mode || opt.no_expensive_trust_checks )
+                ;
+            else {
+               /* trustletter should always be defined here */
+               if(trustletter)
+                 printf("%c", trustletter );
+            }
+            printf(":%u:%d:%08lX%08lX:%s:%s:::::",
                        nbits_from_pk( pk2 ),
                        pk2->pubkey_algo,
                        (ulong)keyid2[0],(ulong)keyid2[1],
-                       datestr_from_pk( pk2 ),
-                       pk2->expiredate? strtimestamp(pk2->expiredate):""
+                       colon_datestr_from_pk( pk2 ),
+                       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('\n');
-           }
-           else {
-               printf("sub  %4u%c/%08lX %s", nbits_from_pk( pk2 ),
-                                          pubkey_letter( pk2->pubkey_algo ),
-                                          (ulong)keyid2[1],
-                                          datestr_from_pk( pk2 ) );
-               if( pk2->expiredate ) {
-                   printf(_(" [expires: %s]"), expirestr_from_pk( pk2 ) );
-               }
-               putchar('\n');
-           }
-           if( opt.fingerprint > 1 )
-               fingerprint( pk2, NULL );
+            print_capabilities (pk2, NULL, NULL);
+            putchar('\n');
+           if( fpr > 1 )
+               print_fingerprint( pk2, NULL, 0 );
            if( opt.with_key_data )
-               print_key_data( pk2, keyid2 );
+               print_key_data( pk2 );
        }
        else if( node->pkt->pkttype == PKT_SECRET_SUBKEY ) {
            u32 keyid2[2];
            PKT_secret_key *sk2 = node->pkt->pkt.secret_key;
 
            if( !any ) {
+                putchar(':');
+                putchar(':');
+                print_capabilities (pk, sk, keyblock);
                putchar('\n');
-               if( opt.fingerprint )
-                   fingerprint( pk, sk ); /* of the main key */
+               if( fpr )
+                   print_fingerprint( pk, sk, 0 ); /* of the main key */
                any = 1;
            }
 
            keyid_from_sk( sk2, keyid2 );
-           if( opt.with_colons )
-               printf("ssb::%u:%d:%08lX%08lX:%s:%s:::\n",
+            printf("ssb::%u:%d:%08lX%08lX:%s:%s:::::",
                        nbits_from_sk( sk2 ),
                        sk2->pubkey_algo,
                        (ulong)keyid2[0],(ulong)keyid2[1],
-                       datestr_from_sk( sk2 ),
-                       sk2->expiredate? strtimestamp(sk2->expiredate):""
-                       /* fixme: add LID */
-                                               );
-           else
-               printf("ssb  %4u%c/%08lX %s\n", nbits_from_sk( sk2 ),
-                                          pubkey_letter( sk2->pubkey_algo ),
-                                          (ulong)keyid2[1],
-                                          datestr_from_sk( sk2 ) );
-           if( opt.fingerprint > 1 )
-               fingerprint( NULL, sk2 );
-
+                       colon_datestr_from_sk( sk2 ),
+                       colon_strtime (sk2->expiredate)
+                   /* fixme: add LID */ );
+            print_capabilities (NULL, sk2, NULL);
+            if (opt.fixed_list_mode) {
+              /* We print the serial number only in fixed list mode
+                 for the primary key so, so avoid questions we print
+                 it for subkeys also only in this mode.  There is no
+                 technical reason, though. */
+              putchar(':'); /* End of field 13. */
+              putchar(':'); /* End of field 14. */
+              if (sk2->protect.s2k.mode == 1001)
+                putchar('#'); /* Key is just a stub. */
+              else if (sk2->protect.s2k.mode == 1002) {
+                /* Key is stored on an external token (card) or handled by
+                   the gpg-agent.  Print the serial number of that token
+                   here. */
+                for (i=0; i < sk2->protect.ivlen; i++)
+                  printf ("%02X", sk2->protect.iv[i]);
+              }
+              putchar(':'); /* End of field 15. */
+            }
+            putchar ('\n');
+           if( fpr > 1 )
+              print_fingerprint( NULL, sk2, 0 );
        }
        else if( opt.list_sigs && node->pkt->pkttype == PKT_SIGNATURE ) {
            PKT_signature *sig = node->pkt->pkt.signature;
-           int sigrc;
-          char *sigstr;
+           int sigrc,fprokay=0;
+            char *sigstr;
+           size_t fplen;
+           byte fparray[MAX_FINGERPRINT_LEN];
 
            if( !any ) { /* no user id, (maybe a revocation follows)*/
                if( sig->sig_class == 0x20 )
-                   puts("[revoked]");
+                   fputs("[revoked]:", stdout);
                else if( sig->sig_class == 0x18 )
-                   puts("[key binding]");
+                   fputs("[key binding]:", stdout);
                else if( sig->sig_class == 0x28 )
-                   puts("[subkey revoked]");
-               else
-                   putchar('\n');
-               if( opt.fingerprint )
-                   fingerprint( pk, sk );
+                   fputs("[subkey revoked]:", stdout);
+                else
+                    putchar (':');
+                putchar(':');
+                print_capabilities (pk, sk, keyblock);
+                putchar('\n');
+               if( fpr )
+                   print_fingerprint( pk, sk, 0 );
                any=1;
            }
 
@@ -463,102 +1281,342 @@ list_keyblock( KBNODE keyblock, int secret )
               sigstr = "sig";
            else if( sig->sig_class == 0x18 )
               sigstr = "sig";
+           else if( sig->sig_class == 0x1F )
+              sigstr = "sig";
            else {
-               if( opt.with_colons )
-                   printf("sig::::::::::%02x:\n",sig->sig_class );
-               else
-                   printf("sig                             "
-                      "[unexpected signature class 0x%02x]\n",sig->sig_class );
+                printf ("sig::::::::::%02x%c:\n",
+                        sig->sig_class, sig->flags.exportable?'x':'l');
                continue;
            }
            if( opt.check_sigs ) {
+               PKT_public_key *signer_pk=NULL;
+
                fflush(stdout);
-               rc = check_key_signature( keyblock, node, NULL );
+               if(opt.no_sig_cache)
+                 signer_pk=xmalloc_clear(sizeof(PKT_public_key));
+
+               rc = check_key_signature2( keyblock, node, NULL, signer_pk,
+                                          NULL, NULL, NULL );
                switch( rc ) {
                  case 0:                  sigrc = '!'; break;
-                 case GPGERR_BAD_SIGN:    sigrc = '-'; break;
-                 case GPGERR_NO_PUBKEY:   sigrc = '?'; break;
+                 case G10ERR_BAD_SIGN:    sigrc = '-'; break;
+                 case G10ERR_NO_PUBKEY: 
+                 case G10ERR_UNU_PUBKEY:  sigrc = '?'; break;
                  default:                 sigrc = '%'; break;
                }
+
+               if(opt.no_sig_cache)
+                 {
+                   if(rc==0)
+                     {
+                       fingerprint_from_pk (signer_pk, fparray, &fplen);
+                       fprokay=1;
+                     }
+                   free_public_key(signer_pk);
+                 }
            }
            else {
                rc = 0;
                sigrc = ' ';
            }
-          fputs( sigstr, stdout );
-           if( opt.with_colons ) {
-               putchar(':');
-               if( sigrc != ' ' )
-                   putchar(sigrc);
-               printf("::%d:%08lX%08lX:%s::::", sig->pubkey_algo,
-                                                (ulong)sig->keyid[0],
-                          (ulong)sig->keyid[1], datestr_from_sig(sig));
-           }
-           else
-               printf("%c       %08lX %s  ",
-                   sigrc, (ulong)sig->keyid[1], datestr_from_sig(sig));
+            fputs( sigstr, stdout );
+            putchar(':');
+            if( sigrc != ' ' )
+                putchar(sigrc);
+            printf("::%d:%08lX%08lX:%s:%s:", sig->pubkey_algo,
+                  (ulong)sig->keyid[0], (ulong)sig->keyid[1],
+                  colon_datestr_from_sig(sig),
+                  colon_expirestr_from_sig(sig));
+
+           if(sig->trust_depth || sig->trust_value)
+             printf("%d %d",sig->trust_depth,sig->trust_value);
+           printf(":");
+
+           if(sig->trust_regexp)
+             print_string(stdout,sig->trust_regexp,
+                          strlen(sig->trust_regexp),':');
+           printf(":");
+
            if( sigrc == '%' )
-               printf("[%s] ", gpg_errstr(rc) );
+               printf("[%s] ", g10_errstr(rc) );
            else if( sigrc == '?' )
                ;
            else if ( !opt.fast_list_mode ) {
                size_t n;
                char *p = get_user_id( sig->keyid, &n );
-               if( opt.with_colons )
-                   print_string( stdout, p, n, ':' );
-               else
-                   print_utf8_string( stdout, p, n );
-               gcry_free(p);
+                print_string( stdout, p, n, ':' );
+               xfree(p);
            }
-           if( opt.with_colons )
-               printf(":%02x:", sig->sig_class );
-           putchar('\n');
-           /* FIXME: check or list other sigs here (subpkt PRIV_ADD_SIG)*/
+            printf(":%02x%c:", sig->sig_class,sig->flags.exportable?'x':'l');
+
+           if(opt.no_sig_cache && opt.check_sigs && fprokay)
+             {
+               printf(":");
+
+               for (i=0; i < fplen ; i++ )
+                 printf ("%02X", fparray[i] );
+
+               printf(":");
+             }
+
+           printf("\n");
+
+           if(opt.show_subpackets)
+             print_subpackets_colon(sig);
+
+           /* fixme: check or list other sigs here */
        }
     }
     if( !any ) {/* oops, no user id */
-       if( opt.with_colons )
-           putchar(':');
+        putchar(':');
+        putchar(':');
+        print_capabilities (pk, sk, keyblock);
        putchar('\n');
     }
-    else if( !opt.with_colons )
-       putchar('\n');  /* separator line */
 }
 
+/*
+ * Reorder the keyblock so that the primary user ID (and not attribute
+ * packet) comes first.  Fixme: Replace this by a generic sort
+ * function.  */
+void
+reorder_keyblock (KBNODE keyblock)
+{
+    KBNODE primary = NULL, primary0 = NULL, primary2 = NULL;
+    KBNODE last, node;
+
+    for (node=keyblock; node; primary0=node, node = node->next) {
+       if( node->pkt->pkttype == PKT_USER_ID &&
+           !node->pkt->pkt.user_id->attrib_data &&
+            node->pkt->pkt.user_id->is_primary ) {
+            primary = primary2 = node;
+            for (node=node->next; node; primary2=node, node = node->next ) {
+                if( node->pkt->pkttype == PKT_USER_ID 
+                    || node->pkt->pkttype == PKT_PUBLIC_SUBKEY 
+                    || node->pkt->pkttype == PKT_SECRET_SUBKEY ) {
+                    break;
+                }
+            }
+            break;
+        }
+    }
+    if ( !primary )
+        return;  /* no primary key flag found (should not happen) */
 
+    for (last=NULL, node=keyblock; node; last = node, node = node->next) {
+       if( node->pkt->pkttype == PKT_USER_ID )
+            break;
+    }
+    assert (node);
+    assert (last); /* the user ID is never the first packet */
+    assert (primary0);  /* ditto (this is the node before primary) */
+    if ( node == primary )
+        return; /* already the first one */
 
-static void
-fingerprint( PKT_public_key *pk, PKT_secret_key *sk )
+    last->next = primary;
+    primary0->next = primary2->next;
+    primary2->next = node;
+}
+
+void
+list_keyblock( KBNODE keyblock, int secret, int fpr, void *opaque )
+{
+    reorder_keyblock (keyblock);
+    if (opt.with_colons)
+        list_keyblock_colon (keyblock, secret, fpr );
+    else
+        list_keyblock_print (keyblock, secret, fpr, opaque );
+}
+
+/*
+ * standard function to print the finperprint.
+ * mode 0: as used in key listings, opt.with_colons is honored
+ *      1: print using log_info ()
+ *      2: direct use of tty
+ *      3: direct use of tty but only primary key.
+ * modes 1 and 2 will try and print both subkey and primary key fingerprints
+ */
+void
+print_fingerprint (PKT_public_key *pk, PKT_secret_key *sk, int mode )
 {
-    byte *array, *p;
+    byte array[MAX_FINGERPRINT_LEN], *p;
     size_t i, n;
+    FILE *fp;
+    const char *text;
+    int primary=0;
 
-    p = array = pk? fingerprint_from_pk( pk, NULL, &n )
-                  : fingerprint_from_sk( sk, NULL, &n );
-    if( opt.with_colons ) {
-       printf("fpr:::::::::");
-       for(i=0; i < n ; i++, p++ )
-           printf("%02X", *p );
-       putchar(':');
+    if(sk)
+      {
+       if(sk->main_keyid[0]==sk->keyid[0] && sk->main_keyid[1]==sk->keyid[1])
+         primary=1;
+      }
+    else
+      {
+       if(pk->main_keyid[0]==pk->keyid[0] && pk->main_keyid[1]==pk->keyid[1])
+         primary=1;
+      }
+
+    /* Just to be safe */
+    if(mode&0x80 && !primary)
+      {
+       log_error("primary key is not really primary!\n");
+       return;
+      }
+
+    mode&=~0x80;
+
+    if(!primary && (mode==1 || mode==2))
+      {
+       if(sk)
+         {
+           PKT_secret_key *primary_sk=xmalloc_clear(sizeof(*primary_sk));
+           get_seckey(primary_sk,sk->main_keyid);
+           print_fingerprint(NULL,primary_sk,mode|0x80);
+           free_secret_key(primary_sk);
+         }
+       else
+         {
+           PKT_public_key *primary_pk=xmalloc_clear(sizeof(*primary_pk));
+           get_pubkey(primary_pk,pk->main_keyid);
+           print_fingerprint(primary_pk,NULL,mode|0x80);
+           free_public_key(primary_pk);
+         }
+      }
+
+    if (mode == 1) {
+        fp = log_stream ();
+       if(primary)
+         text = _("Primary key fingerprint:");
+       else
+         text = _("     Subkey fingerprint:");
+    }
+    else if (mode == 2) {
+        fp = NULL; /* use tty */
+       if(primary)
+          /* TRANSLATORS: this should fit into 24 bytes to that the
+           * fingerprint data is properly aligned with the user ID */
+         text = _(" Primary key fingerprint:");
+       else
+         text = _("      Subkey fingerprint:");
+    }
+    else if (mode == 3) {
+        fp = NULL; /* use tty */
+       text = _("      Key fingerprint =");
+    }
+    else {
+        fp = stdout;
+       text = _("      Key fingerprint =");
+    }
+  
+    if (sk)
+       fingerprint_from_sk (sk, array, &n);
+    else
+       fingerprint_from_pk (pk, array, &n);
+    p = array;
+    if (opt.with_colons && !mode) {
+       fprintf (fp, "fpr:::::::::");
+       for (i=0; i < n ; i++, p++ )
+           fprintf (fp, "%02X", *p );
+       putc(':', fp);
     }
     else {
-       printf("     Key fingerprint =");
-       if( n == 20 ) {
-           for(i=0; i < n ; i++, i++, p += 2 ) {
-               if( i == 10 )
-                   putchar(' ');
-               printf(" %02X%02X", *p, p[1] );
+        if (fp)
+            fputs (text, fp);
+        else
+            tty_printf ("%s", text);
+       if (n == 20) {
+           for (i=0; i < n ; i++, i++, p += 2 ) {
+                if (fp) {
+                    if (i == 10 )
+                        putc(' ', fp);
+                    fprintf (fp, " %02X%02X", *p, p[1] );
+                }
+                else {
+                    if (i == 10 )
+                        tty_printf (" ");
+                    tty_printf (" %02X%02X", *p, p[1]);
+                }
            }
        }
        else {
-           for(i=0; i < n ; i++, p++ ) {
-               if( i && !(i%8) )
-                   putchar(' ');
-               printf(" %02X", *p );
+           for (i=0; i < n ; i++, p++ ) {
+                if (fp) {
+                    if (i && !(i%8) )
+                        putc (' ', fp);
+                    fprintf (fp, " %02X", *p );
+                }
+                else {
+                    if (i && !(i%8) )
+                        tty_printf (" ");
+                    tty_printf (" %02X", *p );
+                }
            }
        }
     }
-    putchar('\n');
-    gcry_free(array);
+    if (fp)
+        putc ('\n', fp);
+    else
+        tty_printf ("\n");
 }
 
+/* Print the serial number of an OpenPGP card if available. */
+static void
+print_card_serialno (PKT_secret_key *sk)
+{
+  int i;
+
+  if (!sk)
+    return;
+  if (!sk->is_protected || sk->protect.s2k.mode != 1002) 
+    return; /* Not a card. */
+  if (opt.with_colons)
+    return; /* Handled elsewhere. */
+
+  fputs (_("      Card serial no. ="), stdout);
+  putchar (' ');
+  if (sk->protect.ivlen == 16
+      && !memcmp (sk->protect.iv, "\xD2\x76\x00\x01\x24\x01", 6) )
+    { /* This is an OpenPGP card. Just print the relevant part. */
+      for (i=8; i < 14; i++)
+        {
+          if (i == 10)
+            putchar (' ');
+          printf ("%02X", sk->protect.iv[i]);
+        }
+    }
+  else
+    { /* Something is wrong: Print all. */
+      for (i=0; i < sk->protect.ivlen; i++)
+        printf ("%02X", sk->protect.iv[i]);
+    }
+  putchar ('\n');
+}
+
+
+
+void set_attrib_fd(int fd)
+{
+  static int last_fd=-1;
+
+  if ( fd != -1 && last_fd == fd )
+    return;
+
+  if ( attrib_fp && attrib_fp != stdout && attrib_fp != stderr )
+    fclose (attrib_fp);
+  attrib_fp = NULL;
+  if ( fd == -1 ) 
+    return;
+
+  if( fd == 1 )
+    attrib_fp = stdout;
+  else if( fd == 2 )
+    attrib_fp = stderr;
+  else
+    attrib_fp = fdopen( fd, "wb" );
+  if( !attrib_fp ) {
+    log_fatal("can't open fd %d for attribute output: %s\n",
+             fd, strerror(errno));
+  }
+
+  last_fd = fd;
+}