* options.h, getkey.c (merge_selfsigs_subkey), gpg.c (main), sig-check.c

[gnupg.git] / g10 / mainproc.c

diff --git a/g10/mainproc.c b/g10/mainproc.c
index 2004da1..7c13921 100644 (file)
--- a/g10/mainproc.c
+++ b/g10/mainproc.c
@@ -1,5 +1,6 @@
 /* mainproc.c - handle packets
 /* mainproc.c - handle packets

- * Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+ *               2005 Free Software Foundation, Inc.

  *
  * This file is part of GnuPG.
  *
  *
  * 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
  *
  * 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 <config.h>


@@ -49,7 +51,6 @@ struct kidlist_item {
 };
 
 
 };
 
 

-

 /****************
  * Structure to hold the context
  */
 /****************
  * Structure to hold the context
  */


@@ -70,7 +71,7 @@ struct mainproc_context {
     int have_data;
     IOBUF iobuf;    /* used to get the filename etc. */
     int trustletter; /* temp usage in list_node */
     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 {
         int op;
     struct kidlist_item *pkenc_list;   /* list of encryption packets */
     struct {
         int op;


@@ -94,7 +95,7 @@ release_list( CTX c )
     release_kbnode( c->list );
     while( c->pkenc_list ) {
        struct kidlist_item *tmp = c->pkenc_list->next;
     release_kbnode( c->list );
     while( c->pkenc_list ) {
        struct kidlist_item *tmp = c->pkenc_list->next;

-       m_free( c->pkenc_list );
+       xfree( c->pkenc_list );

        c->pkenc_list = tmp;
     }
     c->pkenc_list = NULL;
        c->pkenc_list = tmp;
     }
     c->pkenc_list = NULL;


@@ -103,7 +104,7 @@ release_list( CTX c )
     c->last_was_session_key = 0;
     c->pipemode.op = 0;
     c->pipemode.stop_now = 0;
     c->last_was_session_key = 0;
     c->pipemode.op = 0;
     c->pipemode.stop_now = 0;

-    m_free(c->dek); c->dek = NULL;
+    xfree(c->dek); c->dek = NULL;

 }
 
 
 }
 
 


@@ -238,31 +239,44 @@ add_signature( CTX c, PACKET *pkt )
     return 1;
 }
 
     return 1;
 }
 

-static void
-symkey_decrypt_sesskey( DEK *dek, byte *sesskey, size_t slen )
+static int
+symkey_decrypt_seskey( DEK *dek, byte *seskey, size_t slen )

 {
 {

-    CIPHER_HANDLE hd;
+  CIPHER_HANDLE hd;

 
 

-    if ( slen < 17 || slen > 33 ) {
-        log_error( "weird size for an encrypted session key (%d)\n", slen );
-        return;   
-    }
-    hd = cipher_open( dek->algo, CIPHER_MODE_CFB, 1 );
-    cipher_setkey( hd, dek->key, dek->keylen );
-    cipher_setiv( hd, NULL, 0 );
-    cipher_decrypt( hd, sesskey, sesskey, slen );
-    cipher_close( hd );
-    /* check first byte (the cipher algo) */
-    if ( sesskey[0] > 10 ) {
-        log_error( "invalid symkey algorithm detected (%d)\n", sesskey[0] );
-        return;
+  if(slen < 17 || slen > 33)
+    {
+      log_error ( _("weird size for an encrypted session key (%d)\n"),
+                 (int)slen);
+      return G10ERR_BAD_KEY;

     }
     }

-    /* now we replace the dek components with the real session key
-       to decrypt the contents of the sequencing packet. */
-    dek->keylen = cipher_get_keylen( sesskey[0] ) / 8;
-    dek->algo = sesskey[0];
-    memcpy( dek->key, sesskey + 1, dek->keylen );
-    /*log_hexdump( "thekey", dek->key, dek->keylen );*/
+
+  hd = cipher_open( dek->algo, CIPHER_MODE_CFB, 1 );
+  cipher_setkey( hd, dek->key, dek->keylen );
+  cipher_setiv( hd, NULL, 0 );
+  cipher_decrypt( hd, seskey, seskey, slen );
+  cipher_close( hd );
+
+  /* now we replace the dek components with the real session key to
+     decrypt the contents of the sequencing packet. */
+
+  dek->keylen=slen-1;
+  dek->algo=seskey[0];
+
+  if(dek->keylen > DIM(dek->key))
+    BUG ();
+
+  /* This is not completely accurate, since a bad passphrase may have
+     resulted in a garbage algorithm byte, but it's close enough since
+     a bogus byte here will fail later. */
+  if(dek->algo==CIPHER_ALGO_IDEA)
+    idea_cipher_warn(0);
+
+  memcpy(dek->key, seskey + 1, dek->keylen);
+
+  /*log_hexdump( "thekey", dek->key, dek->keylen );*/
+
+  return 0;

 }   
 
 static void
 }   
 
 static void


@@ -273,26 +287,91 @@ proc_symkey_enc( CTX c, PACKET *pkt )
     enc = pkt->pkt.symkey_enc;
     if (!enc)
         log_error ("invalid symkey encrypted packet\n");
     enc = pkt->pkt.symkey_enc;
     if (!enc)
         log_error ("invalid symkey encrypted packet\n");

-    else {
+    else if(!c->dek)
+      {

         int algo = enc->cipher_algo;
         int algo = enc->cipher_algo;

-       const char *s;
+       const char *s = cipher_algo_to_string (algo);

 
 

-       s = cipher_algo_to_string (algo);
-       if( s )
-           log_info(_("%s encrypted data\n"), s );
+       if(s)
+         {
+           if(!opt.quiet)
+             {
+               if(enc->seskeylen)
+                 log_info(_("%s encrypted session key\n"), s );
+               else
+                 log_info(_("%s encrypted data\n"), s );
+             }
+         }

        else
        else

-           log_info(_("encrypted with unknown algorithm %d\n"), algo );
+         log_error(_("encrypted with unknown algorithm %d\n"), algo );
+
+       if(check_digest_algo(enc->s2k.hash_algo))
+         {
+           log_error(_("passphrase generated with unknown digest"
+                       " algorithm %d\n"),enc->s2k.hash_algo);
+           s=NULL;
+         }

 
        c->last_was_session_key = 2;
 
        c->last_was_session_key = 2;

-       if ( opt.list_only )
-           goto leave;
-       c->dek = passphrase_to_dek( NULL, 0, algo, &enc->s2k, 0, NULL );
-        if (c->dek)
-            c->dek->algo_info_printed = 1;
-        if ( c->dek && enc->seskeylen )
-            symkey_decrypt_sesskey( c->dek, enc->seskey, enc->seskeylen );
-    }
-leave:
+       if(!s || opt.list_only)
+         goto leave;
+
+       if(opt.override_session_key)
+         {
+           c->dek = xmalloc_clear( sizeof *c->dek );
+           if(get_override_session_key(c->dek, opt.override_session_key))
+             {
+               xfree(c->dek);
+               c->dek = NULL;
+             }
+         }
+       else
+         {
+            int canceled;
+
+           c->dek = passphrase_to_dek (NULL, 0, algo, &enc->s2k, 0,
+                                        NULL, &canceled);
+            if (canceled)
+              {
+                /* For unknown reasons passphrase_to_dek does only
+                   return NULL if a new passphrase has been requested
+                   and has not been repeated correctly.  Thus even
+                   with a cancel requested (by means of the gpg-agent)
+                   it won't return NULL but an empty passphrase.  We
+                   take the most conservative approach for now and
+                   work around it right here. */
+                xfree (c->dek);
+                c->dek = NULL;
+              }
+
+           if(c->dek)
+             {
+               c->dek->symmetric=1;
+
+               /* FIXME: This doesn't work perfectly if a symmetric
+                  key comes before a public key in the message - if
+                  the user doesn't know the passphrase, then there is
+                  a chance that the "decrypted" algorithm will happen
+                  to be a valid one, which will make the returned dek
+                  appear valid, so we won't try any public keys that
+                  come later. */
+               if(enc->seskeylen)
+                 {
+                   if(symkey_decrypt_seskey(c->dek, enc->seskey,
+                                            enc->seskeylen))
+                     {
+                       xfree(c->dek);
+                       c->dek=NULL;
+                     }
+                 }
+               else
+                 c->dek->algo_info_printed = 1;
+             }
+         }
+      }
+
+ leave:
+    c->symkeys++;

     free_packet(pkt);
 }
 
     free_packet(pkt);
 }
 


@@ -309,7 +388,7 @@ proc_pubkey_enc( CTX c, PACKET *pkt )
     /* Hmmm: why do I have this algo check here - anyway there is
      * function to check it. */
     if( opt.verbose )
     /* Hmmm: why do I have this algo check here - anyway there is
      * function to check it. */
     if( opt.verbose )

-       log_info(_("public key is %08lX\n"), (ulong)enc->keyid[1] );
+       log_info(_("public key is %s\n"), keystr(enc->keyid) );

 
     if( is_status_enabled() ) {
        char buf[50];
 
     if( is_status_enabled() ) {
        char buf[50];


@@ -322,10 +401,10 @@ proc_pubkey_enc( CTX c, PACKET *pkt )
        /* It does not make much sense to store the session key in
         * secure memory because it has already been passed on the
         * command line and the GCHQ knows about it */
        /* It does not make much sense to store the session key in
         * secure memory because it has already been passed on the
         * command line and the GCHQ knows about it */

-       c->dek = m_alloc_clear( sizeof *c->dek );
+       c->dek = xmalloc_clear( sizeof *c->dek );

        result = get_override_session_key ( c->dek, opt.override_session_key );
        if ( result ) {
        result = get_override_session_key ( c->dek, opt.override_session_key );
        if ( result ) {

-           m_free(c->dek); c->dek = NULL;
+           xfree(c->dek); c->dek = NULL;

        }
     }
     else if( is_ELGAMAL(enc->pubkey_algo)
        }
     }
     else if( is_ELGAMAL(enc->pubkey_algo)


@@ -337,10 +416,10 @@ proc_pubkey_enc( CTX c, PACKET *pkt )
            if( opt.list_only )
                result = -1;
            else {
            if( opt.list_only )
                result = -1;
            else {

-               c->dek = m_alloc_secure_clear( sizeof *c->dek );
+               c->dek = xmalloc_secure_clear( sizeof *c->dek );

                if( (result = get_session_key( enc, c->dek )) ) {
                    /* error: delete the DEK */
                if( (result = get_session_key( enc, c->dek )) ) {
                    /* error: delete the DEK */

-                   m_free(c->dek); c->dek = NULL;
+                   xfree(c->dek); c->dek = NULL;

                }
            }
        }
                }
            }
        }


@@ -352,31 +431,21 @@ proc_pubkey_enc( CTX c, PACKET *pkt )
 
     if( result == -1 )
        ;
 
     if( result == -1 )
        ;

-    else {
-        if( !result ) {
-            if( opt.verbose > 1 )
-                log_info( _("public key encrypted data: good DEK\n") );
-            if ( opt.show_session_key ) {
-                int i;
-                char *buf = m_alloc ( c->dek->keylen*2 + 20 );
-                sprintf ( buf, "%d:", c->dek->algo );
-                for(i=0; i < c->dek->keylen; i++ )
-                    sprintf(buf+strlen(buf), "%02X", c->dek->key[i] );
-                log_info( "session key: \"%s\"\n", buf );
-                write_status_text ( STATUS_SESSION_KEY, buf );
-            }
-        }
+    else
+      {

         /* store it for later display */
         /* store it for later display */

-        {
-            struct kidlist_item *x = m_alloc( sizeof *x );
-            x->kid[0] = enc->keyid[0];
-            x->kid[1] = enc->keyid[1];
-            x->pubkey_algo = enc->pubkey_algo;
-            x->reason = result;
-            x->next = c->pkenc_list;
-            c->pkenc_list = x;
-        }
-    }
+       struct kidlist_item *x = xmalloc( sizeof *x );
+       x->kid[0] = enc->keyid[0];
+       x->kid[1] = enc->keyid[1];
+       x->pubkey_algo = enc->pubkey_algo;
+       x->reason = result;
+       x->next = c->pkenc_list;
+       c->pkenc_list = x;
+
+        if( !result && opt.verbose > 1 )
+         log_info( _("public key encrypted data: good DEK\n") );
+      }
+

     free_packet(pkt);
 }
 
     free_packet(pkt);
 }
 


@@ -399,27 +468,25 @@ print_pkenc_list( struct kidlist_item *list, int failed )
             continue;
 
         algstr = pubkey_algo_to_string( list->pubkey_algo );
             continue;
 
         algstr = pubkey_algo_to_string( list->pubkey_algo );

-        pk = m_alloc_clear( sizeof *pk );
+        pk = xmalloc_clear( sizeof *pk );

 
        if( !algstr )
            algstr = "[?]";
        pk->pubkey_algo = list->pubkey_algo;
 
        if( !algstr )
            algstr = "[?]";
        pk->pubkey_algo = list->pubkey_algo;

-       if( !get_pubkey( pk, list->kid ) ) {
-           size_t n;
+       if( !get_pubkey( pk, list->kid ) )
+         {

            char *p;
            char *p;

-           log_info( _("encrypted with %u-bit %s key, ID %08lX, created %s\n"),
-                      nbits_from_pk( pk ), algstr, (ulong)list->kid[1],
-                      strtimestamp(pk->timestamp) );
-           fputs("      \"", log_stream() );
-           p = get_user_id( list->kid, &n );
-           print_utf8_string2 ( log_stream(), p, n, '"' );
-           m_free(p);
-           fputs("\"\n", log_stream() );
-       }
-       else {
-           log_info(_("encrypted with %s key, ID %08lX\n"),
-                       algstr, (ulong) list->kid[1] );
-       }
+           log_info( _("encrypted with %u-bit %s key, ID %s, created %s\n"),
+                     nbits_from_pk( pk ), algstr, keystr_from_pk(pk),
+                     strtimestamp(pk->timestamp) );
+           p=get_user_id_native(list->kid);
+           fprintf(log_stream(),_("      \"%s\"\n"),p);
+           xfree(p);
+         }
+       else
+         log_info(_("encrypted with %s key, ID %s\n"),
+                  algstr,keystr(list->kid));
+

        free_public_key( pk );
 
        if( list->reason == G10ERR_NO_SECKEY ) {
        free_public_key( pk );
 
        if( list->reason == G10ERR_NO_SECKEY ) {


@@ -431,7 +498,7 @@ print_pkenc_list( struct kidlist_item *list, int failed )
            }
        }
        else if (list->reason)
            }
        }
        else if (list->reason)

-           log_error(_("public key decryption failed: %s\n"),
+           log_info(_("public key decryption failed: %s\n"),

                                                g10_errstr(list->reason));
     }
 }
                                                g10_errstr(list->reason));
     }
 }


@@ -442,10 +509,15 @@ proc_encrypted( CTX c, PACKET *pkt )
 {
     int result = 0;
 
 {
     int result = 0;
 

-    if (!opt.quiet) {
+    if (!opt.quiet)
+      {
+       if(c->symkeys>1)
+         log_info(_("encrypted with %lu passphrases\n"),c->symkeys);
+       else if(c->symkeys==1)
+         log_info(_("encrypted with 1 passphrase\n"));

         print_pkenc_list ( c->pkenc_list, 1 );
         print_pkenc_list ( c->pkenc_list, 0 );
         print_pkenc_list ( c->pkenc_list, 1 );
         print_pkenc_list ( c->pkenc_list, 0 );

-    }
+      }

 
     write_status( STATUS_BEGIN_DECRYPTION );
 
 
     write_status( STATUS_BEGIN_DECRYPTION );
 


@@ -456,50 +528,75 @@ proc_encrypted( CTX c, PACKET *pkt )
         int algo;
         STRING2KEY s2kbuf, *s2k = NULL;
 
         int algo;
         STRING2KEY s2kbuf, *s2k = NULL;
 

-       /* assume this is old style conventional encrypted data */
-        if ( (algo = opt.def_cipher_algo))
-            log_info (_("assuming %s encrypted data\n"),
+       if(opt.override_session_key)
+         {
+           c->dek = xmalloc_clear( sizeof *c->dek );
+           result=get_override_session_key(c->dek, opt.override_session_key);
+           if(result)
+             {
+               xfree(c->dek);
+               c->dek = NULL;
+             }
+         }
+       else
+         {
+           /* assume this is old style conventional encrypted data */
+           if ( (algo = opt.def_cipher_algo))
+             log_info (_("assuming %s encrypted data\n"),

                         cipher_algo_to_string(algo));
                         cipher_algo_to_string(algo));

-        else if ( check_cipher_algo(CIPHER_ALGO_IDEA) ) {
-            algo = opt.def_cipher_algo;
-            if (!algo)
-                algo = opt.s2k_cipher_algo;
-           idea_cipher_warn(1);
-            log_info (_("IDEA cipher unavailable, "
-                        "optimistically attempting to use %s instead\n"),
-                       cipher_algo_to_string(algo));
-        }
-        else {
-            algo = CIPHER_ALGO_IDEA;
-            if (!opt.def_digest_algo) {
-                /* If no digest is given we assume MD5 */
-                s2kbuf.mode = 0;
-                s2kbuf.hash_algo = DIGEST_ALGO_MD5;
-                s2k = &s2kbuf;
-            }
-            log_info (_("assuming %s encrypted data\n"), "IDEA");
-        }
-
-       c->dek = passphrase_to_dek ( NULL, 0, algo, s2k, 0, NULL );
-        if (c->dek)
-            c->dek->algo_info_printed = 1;
+           else if ( check_cipher_algo(CIPHER_ALGO_IDEA) )
+             {
+               algo = opt.def_cipher_algo;
+               if (!algo)
+                 algo = opt.s2k_cipher_algo;
+               idea_cipher_warn(1);
+               log_info (_("IDEA cipher unavailable, "
+                           "optimistically attempting to use %s instead\n"),
+                         cipher_algo_to_string(algo));
+             }
+           else
+             {
+               algo = CIPHER_ALGO_IDEA;
+               if (!opt.s2k_digest_algo)
+                 {
+                   /* If no digest is given we assume MD5 */
+                   s2kbuf.mode = 0;
+                   s2kbuf.hash_algo = DIGEST_ALGO_MD5;
+                   s2k = &s2kbuf;
+                 }
+               log_info (_("assuming %s encrypted data\n"), "IDEA");
+             }
+
+           c->dek = passphrase_to_dek ( NULL, 0, algo, s2k, 0, NULL, NULL );
+           if (c->dek)
+             c->dek->algo_info_printed = 1;
+         }

     }
     else if( !c->dek )
        result = G10ERR_NO_SECKEY;
     if( !result )
        result = decrypt_data( c, pkt->pkt.encrypted, c->dek );
 
     }
     else if( !c->dek )
        result = G10ERR_NO_SECKEY;
     if( !result )
        result = decrypt_data( c, pkt->pkt.encrypted, c->dek );
 

-    m_free(c->dek); c->dek = NULL;

     if( result == -1 )
        ;
     if( result == -1 )
        ;

-    else if( !result ) {
+    else if( !result || (result==G10ERR_BAD_SIGN && opt.ignore_mdc_error)) {

        write_status( STATUS_DECRYPTION_OKAY );
        if( opt.verbose > 1 )
            log_info(_("decryption okay\n"));
        write_status( STATUS_DECRYPTION_OKAY );
        if( opt.verbose > 1 )
            log_info(_("decryption okay\n"));

-       if( pkt->pkt.encrypted->mdc_method )
+       if( pkt->pkt.encrypted->mdc_method && !result )

            write_status( STATUS_GOODMDC );
        else if(!opt.no_mdc_warn)
            write_status( STATUS_GOODMDC );
        else if(!opt.no_mdc_warn)

-           log_info ("WARNING: message was not integrity protected\n");
+           log_info (_("WARNING: message was not integrity protected\n"));
+       if(opt.show_session_key)
+         {
+           int i;
+           char *buf = xmalloc ( c->dek->keylen*2 + 20 );
+           sprintf ( buf, "%d:", c->dek->algo );
+           for(i=0; i < c->dek->keylen; i++ )
+             sprintf(buf+strlen(buf), "%02X", c->dek->key[i] );
+           log_info( "session key: `%s'\n", buf );
+           write_status_text ( STATUS_SESSION_KEY, buf );
+         }

     }
     else if( result == G10ERR_BAD_SIGN ) {
        log_error(_("WARNING: encrypted message has been manipulated!\n"));
     }
     else if( result == G10ERR_BAD_SIGN ) {
        log_error(_("WARNING: encrypted message has been manipulated!\n"));


@@ -512,13 +609,13 @@ proc_encrypted( CTX c, PACKET *pkt )
        /* Hmmm: does this work when we have encrypted using multiple
         * ways to specify the session key (symmmetric and PK)*/
     }
        /* Hmmm: does this work when we have encrypted using multiple
         * ways to specify the session key (symmmetric and PK)*/
     }

+    xfree(c->dek); c->dek = NULL;

     free_packet(pkt);
     c->last_was_session_key = 0;
     write_status( STATUS_END_DECRYPTION );
 }
 
 
     free_packet(pkt);
     c->last_was_session_key = 0;
     write_status( STATUS_END_DECRYPTION );
 }
 
 

-

 static void
 proc_plaintext( CTX c, PACKET *pkt )
 {
 static void
 proc_plaintext( CTX c, PACKET *pkt )
 {


@@ -539,45 +636,62 @@ proc_plaintext( CTX c, PACKET *pkt )
      * See: Russ Allbery's mail 1999-02-09
      */
     any = clearsig = only_md5 = 0;
      * See: Russ Allbery's mail 1999-02-09
      */
     any = clearsig = only_md5 = 0;

-    for(n=c->list; n; n = n->next ) {
-       if( n->pkt->pkttype == PKT_ONEPASS_SIG ) {
-           if( n->pkt->pkt.onepass_sig->digest_algo ) {
+    for(n=c->list; n; n = n->next )
+      {
+       if( n->pkt->pkttype == PKT_ONEPASS_SIG )
+         {
+           /* For the onepass signature case */
+           if( n->pkt->pkt.onepass_sig->digest_algo )
+             {

                md_enable( c->mfx.md, n->pkt->pkt.onepass_sig->digest_algo );
                if( !any && n->pkt->pkt.onepass_sig->digest_algo
                md_enable( c->mfx.md, n->pkt->pkt.onepass_sig->digest_algo );
                if( !any && n->pkt->pkt.onepass_sig->digest_algo

-                                                     == DIGEST_ALGO_MD5 )
-                   only_md5 = 1;
+                   == DIGEST_ALGO_MD5 )
+                 only_md5 = 1;

                else
                else

-                   only_md5 = 0;
+                 only_md5 = 0;

                any = 1;
                any = 1;

-           }
+             }

            if( n->pkt->pkt.onepass_sig->sig_class != 0x01 )
            if( n->pkt->pkt.onepass_sig->sig_class != 0x01 )

-               only_md5 = 0;
-       }
+             only_md5 = 0;
+         }

        else if( n->pkt->pkttype == PKT_GPG_CONTROL
                  && n->pkt->pkt.gpg_control->control
        else if( n->pkt->pkttype == PKT_GPG_CONTROL
                  && n->pkt->pkt.gpg_control->control

-                    == CTRLPKT_CLEARSIGN_START ) {
+                == CTRLPKT_CLEARSIGN_START )
+         {
+           /* For the clearsigned message case */

             size_t datalen = n->pkt->pkt.gpg_control->datalen;
             const byte *data = n->pkt->pkt.gpg_control->data;
 
             /* check that we have at least the sigclass and one hash */
             if ( datalen < 2 )
             size_t datalen = n->pkt->pkt.gpg_control->datalen;
             const byte *data = n->pkt->pkt.gpg_control->data;
 
             /* check that we have at least the sigclass and one hash */
             if ( datalen < 2 )

-                log_fatal("invalid control packet CTRLPKT_CLEARSIGN_START\n"); 
+             log_fatal("invalid control packet CTRLPKT_CLEARSIGN_START\n"); 

             /* Note that we don't set the clearsig flag for not-dash-escaped
              * documents */
             clearsig = (*data == 0x01);
             for( data++, datalen--; datalen; datalen--, data++ )
             /* Note that we don't set the clearsig flag for not-dash-escaped
              * documents */
             clearsig = (*data == 0x01);
             for( data++, datalen--; datalen; datalen--, data++ )

-                md_enable( c->mfx.md, *data );
+             md_enable( c->mfx.md, *data );

             any = 1;
             any = 1;

-            break;  /* no pass signature pakets are expected */
-        }
-    }
+            break;  /* no pass signature packets are expected */
+         }
+       else if(n->pkt->pkttype==PKT_SIGNATURE)
+         {
+           /* For the SIG+LITERAL case that PGP used to use. */
+           md_enable( c->mfx.md, n->pkt->pkt.signature->digest_algo );
+           any=1;
+         }
+      }

 
 

-    if( !any && !opt.skip_verify ) {
-       /* no onepass sig packet: enable all standard algos */
+    if( !any && !opt.skip_verify )
+      {
+       /* This is for the old GPG LITERAL+SIG case.  It's not legal
+          according to 2440, so hopefully it won't come up that
+          often.  There is no good way to specify what algorithms to
+          use in that case, so these three are the historical
+          answer. */

        md_enable( c->mfx.md, DIGEST_ALGO_RMD160 );
        md_enable( c->mfx.md, DIGEST_ALGO_SHA1 );
        md_enable( c->mfx.md, DIGEST_ALGO_MD5 );
        md_enable( c->mfx.md, DIGEST_ALGO_RMD160 );
        md_enable( c->mfx.md, DIGEST_ALGO_SHA1 );
        md_enable( c->mfx.md, DIGEST_ALGO_MD5 );

-    }
+      }

     if( opt.pgp2_workarounds && only_md5 && !opt.skip_verify ) {
        /* This is a kludge to work around a bug in pgp2.  It does only
         * catch those mails which are armored.  To catch the non-armored
     if( opt.pgp2_workarounds && only_md5 && !opt.skip_verify ) {
        /* This is a kludge to work around a bug in pgp2.  It does only
         * catch those mails which are armored.  To catch the non-armored


@@ -654,15 +768,12 @@ proc_compressed( CTX c, PACKET *pkt )
  * Returns: 0 = valid signature or an error code
  */
 static int
  * Returns: 0 = valid signature or an error code
  */
 static int

-do_check_sig( CTX c, KBNODE node, int *is_selfsig, int *is_expkey )
+do_check_sig( CTX c, KBNODE node, int *is_selfsig,
+             int *is_expkey, int *is_revkey )

 {
     PKT_signature *sig;
     MD_HANDLE md = NULL, md2 = NULL;
 {
     PKT_signature *sig;
     MD_HANDLE md = NULL, md2 = NULL;

-    int algo, rc, dum2;
-    u32 dummy;
-
-    if(!is_expkey)
-      is_expkey=&dum2;
+    int algo, rc;

 
     assert( node->pkt->pkttype == PKT_SIGNATURE );
     if( is_selfsig )
 
     assert( node->pkt->pkttype == PKT_SIGNATURE );
     if( is_selfsig )


@@ -716,9 +827,9 @@ do_check_sig( CTX c, KBNODE node, int *is_selfsig, int *is_expkey )
     }
     else
        return G10ERR_SIG_CLASS;
     }
     else
        return G10ERR_SIG_CLASS;

-    rc = signature_check2( sig, md, &dummy, is_expkey );
+    rc = signature_check2( sig, md, NULL, is_expkey, is_revkey, NULL );

     if( rc == G10ERR_BAD_SIGN && md2 )
     if( rc == G10ERR_BAD_SIGN && md2 )

-       rc = signature_check2( sig, md2, &dummy, is_expkey );
+       rc = signature_check2( sig, md2, NULL, is_expkey, is_revkey, NULL );

     md_close(md);
     md_close(md2);
 
     md_close(md);
     md_close(md2);
 


@@ -751,52 +862,6 @@ print_userid( PACKET *pkt )
 }
 
 
 }
 
 

-static void
-print_notation_data( PKT_signature *sig )
-{
-    size_t n, n1, n2;
-    const byte *p;
-    int seq = 0;
-
-    while((p=enum_sig_subpkt(sig->hashed,SIGSUBPKT_NOTATION,&n,&seq,NULL))) {
-       if( n < 8 ) {
-           log_info(_("WARNING: invalid notation data found\n"));
-           return;
-       }
-       if( !(*p & 0x80) )
-           return; /* not human readable */
-       n1 = (p[4] << 8) | p[5];
-       n2 = (p[6] << 8) | p[7];
-       p += 8;
-       if( 8+n1+n2 != n ) {
-           log_info(_("WARNING: invalid notation data found\n"));
-           return;
-       }
-       log_info(_("Notation: ") );
-       print_string( log_stream(), p, n1, 0 );
-       putc( '=', log_stream() );
-       print_string( log_stream(), p+n1, n2, 0 );
-       putc( '\n', log_stream() );
-        write_status_buffer ( STATUS_NOTATION_NAME, p   , n1, 0 );
-        write_status_buffer ( STATUS_NOTATION_DATA, p+n1, n2, 50 );
-    }
-
-    seq=0;
-
-    while((p=enum_sig_subpkt(sig->hashed,SIGSUBPKT_POLICY,&n,&seq,NULL))) {
-       log_info(_("Policy: ") );
-       print_string( log_stream(), p, n, 0 );
-       putc( '\n', log_stream() );
-        write_status_buffer ( STATUS_POLICY_URL, p, n, 0 );
-    }
-
-    /* Now check whether the key of this signature has some
-     * notation data */
-
-    /* TODO */
-}
-
-

 /****************
  * List the certificate in a user friendly way
  */
 /****************
  * List the certificate in a user friendly way
  */


@@ -813,44 +878,38 @@ list_node( CTX c, KBNODE node )
             || node->pkt->pkttype == PKT_PUBLIC_SUBKEY ) {
        PKT_public_key *pk = node->pkt->pkt.public_key;
 
             || node->pkt->pkttype == PKT_PUBLIC_SUBKEY ) {
        PKT_public_key *pk = node->pkt->pkt.public_key;
 

-       if( opt.with_colons ) {
+       if( opt.with_colons )
+         {

            u32 keyid[2];
            keyid_from_pk( pk, keyid );
            u32 keyid[2];
            keyid_from_pk( pk, keyid );

-           if( mainkey ) {
-               c->local_id = pk->local_id;
-               c->trustletter = opt.fast_list_mode?
-                                          0 : get_validity_info( pk, NULL );
-           }
+           if( mainkey )
+             c->trustletter = opt.fast_list_mode?
+               0 : get_validity_info( pk, NULL );

            printf("%s:", mainkey? "pub":"sub" );
            if( c->trustletter )
            printf("%s:", mainkey? "pub":"sub" );
            if( c->trustletter )

-               putchar( c->trustletter );
-           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(':');
+             putchar( c->trustletter );
+           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( mainkey && !opt.fast_list_mode )
            if( mainkey && !opt.fast_list_mode )

-                 putchar( get_ownertrust_info (pk) );
+             putchar( get_ownertrust_info (pk) );

            putchar(':');
            if( node->next && node->next->pkt->pkttype == PKT_RING_TRUST) {
            putchar(':');
            if( node->next && node->next->pkt->pkttype == PKT_RING_TRUST) {

-               putchar('\n'); any=1;
-               if( opt.fingerprint )
-                   print_fingerprint( pk, NULL, 0 );
-               printf("rtv:1:%u:\n",
-                           node->next->pkt->pkt.ring_trust->trustval );
+             putchar('\n'); any=1;
+             if( opt.fingerprint )
+               print_fingerprint( pk, NULL, 0 );
+             printf("rtv:1:%u:\n",
+                    node->next->pkt->pkt.ring_trust->trustval );

            }
            }

-       }
+         }

        else
        else

-           printf("%s  %4u%c/%08lX %s ",
-                                     mainkey? "pub":"sub",
-                                     nbits_from_pk( pk ),
-                                     pubkey_letter( pk->pubkey_algo ),
-                                     (ulong)keyid_from_pk( pk, NULL ),
-                                     datestr_from_pk( pk )     );
+         printf("%s  %4u%c/%s %s%s",
+                mainkey? "pub":"sub", nbits_from_pk( pk ),
+                pubkey_letter( pk->pubkey_algo ), keystr_from_pk( pk ),
+                datestr_from_pk( pk ), mainkey?" ":"");

 
        if( mainkey ) {
            /* and now list all userids with their signatures */
 
        if( mainkey ) {
            /* and now list all userids with their signatures */


@@ -895,9 +954,22 @@ 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(" [");
+               printf(_("revoked: %s"),revokestr_from_pk(pk));
+               printf("]");
+             }
+           else if( pk->expiredate )
+             {
+               printf(" [");
+               printf(_("expires: %s"),expirestr_from_pk(pk));
+               printf("]");
+             }
+         }

 
        if( !any )
            putchar('\n');
 
        if( !any )
            putchar('\n');


@@ -908,25 +980,23 @@ list_node( CTX c, KBNODE node )
             || node->pkt->pkttype == PKT_SECRET_SUBKEY ) {
        PKT_secret_key *sk = node->pkt->pkt.secret_key;
 
             || node->pkt->pkttype == PKT_SECRET_SUBKEY ) {
        PKT_secret_key *sk = node->pkt->pkt.secret_key;
 

-       if( opt.with_colons ) {
+       if( opt.with_colons )
+         {

            u32 keyid[2];
            keyid_from_sk( sk, keyid );
            printf("%s::%u:%d:%08lX%08lX:%s:%s:::",
            u32 keyid[2];
            keyid_from_sk( sk, keyid );
            printf("%s::%u:%d:%08lX%08lX:%s:%s:::",

-                   mainkey? "sec":"ssb",
-                   nbits_from_sk( sk ),
-                   sk->pubkey_algo,
-                   (ulong)keyid[0],(ulong)keyid[1],
-                   colon_datestr_from_sk( sk ),
-                   colon_strtime (sk->expiredate)
-                   /* fixme: add LID */ );
-       }
+                  mainkey? "sec":"ssb",
+                  nbits_from_sk( sk ),
+                  sk->pubkey_algo,
+                  (ulong)keyid[0],(ulong)keyid[1],
+                  colon_datestr_from_sk( sk ),
+                  colon_strtime (sk->expiredate)
+                  /* fixme: add LID */ );
+         }

        else
        else

-           printf("%s  %4u%c/%08lX %s ",
-                                     mainkey? "sec":"ssb",
-                                     nbits_from_sk( sk ),
-                                     pubkey_letter( sk->pubkey_algo ),
-                                     (ulong)keyid_from_sk( sk, NULL ),
-                                     datestr_from_sk( sk )   );
+         printf("%s  %4u%c/%s %s ", mainkey? "sec":"ssb",
+                nbits_from_sk( sk ), pubkey_letter( sk->pubkey_algo ),
+                keystr_from_sk( sk ), datestr_from_sk( sk ));

        if( mainkey ) {
            /* and now list all userids with their signatures */
            for( node = node->next; node; node = node->next ) {
        if( mainkey ) {
            /* and now list all userids with their signatures */
            for( node = node->next; node; node = node->next ) {


@@ -978,7 +1048,7 @@ list_node( CTX c, KBNODE node )
        char *p;
        int sigrc = ' ';
 
        char *p;
        int sigrc = ' ';
 

-       if( !opt.list_sigs )
+       if( !opt.verbose )

            return;
 
        if( sig->sig_class == 0x20 || sig->sig_class == 0x30 )
            return;
 
        if( sig->sig_class == 0x20 || sig->sig_class == 0x30 )


@@ -987,7 +1057,7 @@ list_node( CTX c, KBNODE node )
            fputs("sig", stdout);
        if( opt.check_sigs ) {
            fflush(stdout);
            fputs("sig", stdout);
        if( opt.check_sigs ) {
            fflush(stdout);

-           switch( (rc2=do_check_sig( c, node, &is_selfsig, NULL )) ) {
+           switch( (rc2=do_check_sig( c, node, &is_selfsig, NULL, NULL )) ) {

              case 0:                  sigrc = '!'; break;
              case G10ERR_BAD_SIGN:    sigrc = '-'; break;
              case G10ERR_NO_PUBKEY: 
              case 0:                  sigrc = '!'; break;
              case G10ERR_BAD_SIGN:    sigrc = '-'; break;
              case G10ERR_NO_PUBKEY: 


@@ -1013,13 +1083,23 @@ list_node( CTX c, KBNODE node )
            putchar(':');
            if( sigrc != ' ' )
                putchar(sigrc);
            putchar(':');
            if( sigrc != ' ' )
                putchar(sigrc);

-           printf("::%d:%08lX%08lX:%s::::", sig->pubkey_algo,
-                                            (ulong)sig->keyid[0],
-                      (ulong)sig->keyid[1], colon_datestr_from_sig(sig));
+           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(":");

        }
        else
        }
        else

-           printf("%c       %08lX %s   ",
-                   sigrc, (ulong)sig->keyid[1], datestr_from_sig(sig));
+         printf("%c       %s %s   ",
+                sigrc, keystr(sig->keyid), datestr_from_sig(sig));

        if( sigrc == '%' )
            printf("[%s] ", g10_errstr(rc2) );
        else if( sigrc == '?' )
        if( sigrc == '%' )
            printf("[%s] ", g10_errstr(rc2) );
        else if( sigrc == '?' )


@@ -1034,7 +1114,7 @@ list_node( CTX c, KBNODE node )
        else if( !opt.fast_list_mode ) {
            p = get_user_id( sig->keyid, &n );
            print_string( stdout, p, n, opt.with_colons );
        else if( !opt.fast_list_mode ) {
            p = get_user_id( sig->keyid, &n );
            print_string( stdout, p, n, opt.with_colons );

-           m_free(p);
+           xfree(p);

        }
        if( opt.with_colons )
            printf(":%02x%c:", sig->sig_class, sig->flags.exportable?'x':'l');
        }
        if( opt.with_colons )
            printf(":%02x%c:", sig->sig_class, sig->flags.exportable?'x':'l');


@@ -1050,11 +1130,11 @@ int
 proc_packets( void *anchor, IOBUF a )
 {
     int rc;
 proc_packets( void *anchor, IOBUF a )
 {
     int rc;

-    CTX c = m_alloc_clear( sizeof *c );
+    CTX c = xmalloc_clear( sizeof *c );

 
     c->anchor = anchor;
     rc = do_proc_packets( c, a );
 
     c->anchor = anchor;
     rc = do_proc_packets( c, a );

-    m_free( c );
+    xfree( c );

     return rc;
 }
 
     return rc;
 }
 


@@ -1064,7 +1144,7 @@ int
 proc_signature_packets( void *anchor, IOBUF a,
                        STRLIST signedfiles, const char *sigfilename )
 {
 proc_signature_packets( void *anchor, IOBUF a,
                        STRLIST signedfiles, const char *sigfilename )
 {

-    CTX c = m_alloc_clear( sizeof *c );
+    CTX c = xmalloc_clear( sizeof *c );

     int rc;
 
     c->anchor = anchor;
     int rc;
 
     c->anchor = anchor;


@@ -1072,20 +1152,20 @@ proc_signature_packets( void *anchor, IOBUF a,
     c->signed_data = signedfiles;
     c->sigfilename = sigfilename;
     rc = do_proc_packets( c, a );
     c->signed_data = signedfiles;
     c->sigfilename = sigfilename;
     rc = do_proc_packets( c, a );

-    m_free( c );
+    xfree( c );

     return rc;
 }
 
 int
 proc_encryption_packets( void *anchor, IOBUF a )
 {
     return rc;
 }
 
 int
 proc_encryption_packets( void *anchor, IOBUF a )
 {

-    CTX c = m_alloc_clear( sizeof *c );
+    CTX c = xmalloc_clear( sizeof *c );

     int rc;
 
     c->anchor = anchor;
     c->encrypt_only = 1;
     rc = do_proc_packets( c, a );
     int rc;
 
     c->anchor = anchor;
     c->encrypt_only = 1;
     rc = do_proc_packets( c, a );

-    m_free( c );
+    xfree( c );

     return rc;
 }
 
     return rc;
 }
 


@@ -1093,7 +1173,7 @@ proc_encryption_packets( void *anchor, IOBUF a )
 int
 do_proc_packets( CTX c, IOBUF a )
 {
 int
 do_proc_packets( CTX c, IOBUF a )
 {

-    PACKET *pkt = m_alloc( sizeof *pkt );
+    PACKET *pkt = xmalloc( sizeof *pkt );

     int rc=0;
     int any_data=0;
     int newpkt;
     int rc=0;
     int any_data=0;
     int newpkt;


@@ -1104,8 +1184,8 @@ do_proc_packets( CTX c, IOBUF a )
        any_data = 1;
        if( rc ) {
            free_packet(pkt);
        any_data = 1;
        if( rc ) {
            free_packet(pkt);

-            /* stop processing hwne an invalid packet has been encountered
-             * but don't do so when we are doing a --list-packet. */
+            /* stop processing when an invalid packet has been encountered
+             * but don't do so when we are doing a --list-packets. */

            if( rc == G10ERR_INVALID_PACKET && opt.list_packets != 2 )
                break;
            continue;
            if( rc == G10ERR_INVALID_PACKET && opt.list_packets != 2 )
                break;
            continue;


@@ -1201,7 +1281,7 @@ do_proc_packets( CTX c, IOBUF a )
        if( newpkt == -1 )
            ;
        else if( newpkt ) {
        if( newpkt == -1 )
            ;
        else if( newpkt ) {

-           pkt = m_alloc( sizeof *pkt );
+           pkt = xmalloc( sizeof *pkt );

            init_packet(pkt);
        }
        else
            init_packet(pkt);
        }
        else


@@ -1223,20 +1303,100 @@ do_proc_packets( CTX c, IOBUF a )
 
   leave:
     release_list( c );
 
   leave:
     release_list( c );

-    m_free(c->dek);
+    xfree(c->dek);

     free_packet( pkt );
     free_packet( pkt );

-    m_free( pkt );
+    xfree( pkt );

     free_md_filter_context( &c->mfx );
     return rc;
 }
 
 
     free_md_filter_context( &c->mfx );
     return rc;
 }
 
 

+/* Helper for pka_uri_from_sig to parse the to-be-verified address out
+   of the notation data. */
+static pka_info_t *
+get_pka_address (PKT_signature *sig)
+{
+  const unsigned char *p;
+  size_t len, n1, n2;
+  int seq = 0;
+  pka_info_t *pka = NULL;
+
+  while ((p = enum_sig_subpkt (sig->hashed, SIGSUBPKT_NOTATION,
+                               &len, &seq, NULL)))
+    {
+      if (len < 8)
+        continue; /* Notation packet is too short. */
+      n1 = (p[4]<<8)|p[5];
+      n2 = (p[6]<<8)|p[7];
+      if (8 + n1 + n2 != len)
+        continue; /* Length fields of notation packet are inconsistent. */
+      p += 8;
+      if (n1 != 21 || memcmp (p, "pka-address@gnupg.org", 21))
+        continue; /* Not the notation we want. */
+      p += n1;
+      if (n2 < 3)
+        continue; /* Impossible email address. */
+
+      if (pka)
+        break; /* For now we only use the first valid PKA notation. In
+                  future we might want to keep additional PKA
+                  notations in a linked list. */
+
+      pka = xmalloc (sizeof *pka + n2);
+      pka->valid = 0;
+      pka->checked = 0;
+      pka->uri = NULL;
+      memcpy (pka->email, p, n2);
+      pka->email[n2] = 0;
+
+      if (!is_valid_mailbox (pka->email))
+        {
+          /* We don't accept invalid mail addresses. */
+          xfree (pka);
+          pka = NULL;
+        }
+    }
+
+  return pka;
+}
+
+
+/* Return the URI from a DNS PKA record.  If this record has already
+   be retrieved for the signature we merely return it; if not we go
+   out and try to get that DNS record. */
+static const char *
+pka_uri_from_sig (PKT_signature *sig)
+{
+  if (!sig->flags.pka_tried)
+    {
+      assert (!sig->pka_info);
+      sig->flags.pka_tried = 1;
+      sig->pka_info = get_pka_address (sig);
+      if (sig->pka_info)
+        {
+          char *uri;
+
+          uri = get_pka_info (sig->pka_info->email, sig->pka_info->fpr);
+          if (uri)
+            {
+              sig->pka_info->valid = 1;
+              if (!*uri)
+                xfree (uri);
+              else
+                sig->pka_info->uri = uri;
+            }
+        }
+    }
+  return sig->pka_info? sig->pka_info->uri : NULL;
+}
+
+

 static int
 check_sig_and_print( CTX c, KBNODE node )
 {
     PKT_signature *sig = node->pkt->pkt.signature;
 static int
 check_sig_and_print( CTX c, KBNODE node )
 {
     PKT_signature *sig = node->pkt->pkt.signature;

-    const char *astr, *tstr;
-    int rc, is_expkey=0;
+    const char *astr;
+    int rc, is_expkey=0, is_revkey=0;

 
     if( opt.skip_verify ) {
        log_info(_("signature verification suppressed\n"));
 
     if( opt.skip_verify ) {
        log_info(_("signature verification suppressed\n"));


@@ -1297,23 +1457,112 @@ check_sig_and_print( CTX c, KBNODE node )
             }
         }
     }
             }
         }
     }

-    

 
 

-
-    tstr = asctimestamp(sig->timestamp);

     astr = pubkey_algo_to_string( sig->pubkey_algo );
     astr = pubkey_algo_to_string( sig->pubkey_algo );

-    log_info(_("Signature made %.*s using %s key ID %08lX\n"),
-           (int)strlen(tstr), tstr, astr? astr: "?", (ulong)sig->keyid[1] );
+    if(keystrlen()>8)
+      {
+       log_info(_("Signature made %s\n"),asctimestamp(sig->timestamp));
+       log_info(_("               using %s key %s\n"),
+                astr? astr: "?",keystr(sig->keyid));
+      }
+    else
+      log_info(_("Signature made %s using %s key ID %s\n"),
+              asctimestamp(sig->timestamp), astr? astr: "?",
+              keystr(sig->keyid));
+
+    rc = do_check_sig(c, node, NULL, &is_expkey, &is_revkey );
+
+    /* If the key isn't found, check for a preferred keyserver */
+
+    if(rc==G10ERR_NO_PUBKEY && sig->flags.pref_ks)
+      {
+       const byte *p;
+       int seq=0;
+       size_t n;
+
+       while((p=enum_sig_subpkt(sig->hashed,SIGSUBPKT_PREF_KS,&n,&seq,NULL)))
+         {
+           /* According to my favorite copy editor, in English
+              grammar, you say "at" if the key is located on a web
+              page, but "from" if it is located on a keyserver.  I'm
+              not going to even try to make two strings here :) */
+           log_info(_("Key available at: ") );
+           print_utf8_string( log_stream(), p, n );
+           putc( '\n', log_stream() );
+
+           if(opt.keyserver_options.options&KEYSERVER_AUTO_KEY_RETRIEVE
+              && opt.keyserver_options.options&KEYSERVER_HONOR_KEYSERVER_URL)
+             {
+               struct keyserver_spec *spec;
+
+               spec=parse_preferred_keyserver(sig);
+               if(spec)
+                 {
+                   int res;
+
+                   glo_ctrl.in_auto_key_retrieve++;
+                   res=keyserver_import_keyid(sig->keyid,spec);
+                   glo_ctrl.in_auto_key_retrieve--;
+                   if(!res)
+                     rc=do_check_sig(c, node, NULL, &is_expkey, &is_revkey );
+                   free_keyserver_spec(spec);
+
+                   if(!rc)
+                     break;
+                 }
+             }
+         }
+      }
+
+
+    /* If the preferred keyserver thing above didn't work, our second
+       try is to use the URI from a DNS PKA record. */
+    if ( rc == G10ERR_NO_PUBKEY 
+         && (opt.keyserver_options.options&KEYSERVER_AUTO_PKA_RETRIEVE))
+      {
+        const char *uri = pka_uri_from_sig (sig);
+        
+        if (uri)
+          {
+            /* FIXME: We might want to locate the key using the
+               fingerprint instead of the keyid. */
+            int res;
+            struct keyserver_spec *spec;
+            
+            spec = parse_keyserver_uri (uri, 0, NULL, 0);
+            if (spec)
+              {
+                glo_ctrl.in_auto_key_retrieve++;
+                res = keyserver_import_keyid (sig->keyid, spec);
+                glo_ctrl.in_auto_key_retrieve--;
+                free_keyserver_spec (spec);
+                if (!res)
+                  rc = do_check_sig(c, node, NULL, &is_expkey, &is_revkey );
+              }
+          }
+      }
+
+
+    /* If the preferred keyserver thing above didn't work and we got
+       no information from the DNS PKA, this is a third try. */
+
+    if( rc == G10ERR_NO_PUBKEY && opt.keyserver
+       && (opt.keyserver_options.options&KEYSERVER_AUTO_KEY_RETRIEVE))
+      {
+       int res;
+
+       glo_ctrl.in_auto_key_retrieve++;
+       res=keyserver_import_keyid ( sig->keyid, opt.keyserver );
+       glo_ctrl.in_auto_key_retrieve--;
+       if(!res)
+         rc = do_check_sig(c, node, NULL, &is_expkey, &is_revkey );
+      }

 
 

-    rc = do_check_sig(c, node, NULL, &is_expkey );
-    if( rc == G10ERR_NO_PUBKEY && opt.keyserver_scheme && opt.keyserver_options.auto_key_retrieve) {
-       if( keyserver_import_keyid ( sig->keyid )==0 )
-           rc = do_check_sig(c, node, NULL, &is_expkey );
-    }

     if( !rc || rc == G10ERR_BAD_SIGN ) {
        KBNODE un, keyblock;
        int count=0, statno;
         char keyid_str[50];
     if( !rc || rc == G10ERR_BAD_SIGN ) {
        KBNODE un, keyblock;
        int count=0, statno;
         char keyid_str[50];

+       PKT_public_key *pk=NULL;

 
        if(rc)
          statno=STATUS_BADSIG;
 
        if(rc)
          statno=STATUS_BADSIG;


@@ -1321,6 +1570,8 @@ check_sig_and_print( CTX c, KBNODE node )
          statno=STATUS_EXPSIG;
        else if(is_expkey)
          statno=STATUS_EXPKEYSIG;
          statno=STATUS_EXPSIG;
        else if(is_expkey)
          statno=STATUS_EXPKEYSIG;

+       else if(is_revkey)
+         statno=STATUS_REVKEYSIG;

        else
          statno=STATUS_GOODSIG;
 
        else
          statno=STATUS_GOODSIG;
 


@@ -1331,6 +1582,13 @@ check_sig_and_print( CTX c, KBNODE node )
 
         /* find and print the primary user ID */
        for( un=keyblock; un; un = un->next ) {
 
         /* find and print the primary user ID */
        for( un=keyblock; un; un = un->next ) {

+           char *p;
+           int valid;
+           if(un->pkt->pkttype==PKT_PUBLIC_KEY)
+             {
+               pk=un->pkt->pkt.public_key;
+               continue;
+             }

            if( un->pkt->pkttype != PKT_USER_ID )
                continue;
            if ( !un->pkt->pkt.user_id->created )
            if( un->pkt->pkttype != PKT_USER_ID )
                continue;
            if ( !un->pkt->pkt.user_id->created )


@@ -1341,26 +1599,45 @@ check_sig_and_print( CTX c, KBNODE node )
                 continue;
            if ( !un->pkt->pkt.user_id->is_primary )
                continue;
                 continue;
            if ( !un->pkt->pkt.user_id->is_primary )
                continue;

-           /* We want the textual user ID here */
+           /* We want the textual primary user ID here */

            if ( un->pkt->pkt.user_id->attrib_data )
                continue;
            if ( un->pkt->pkt.user_id->attrib_data )
                continue;

-            
+
+           assert(pk);
+
+           /* Get it before we print anything to avoid interrupting
+              the output with the "please do a --check-trustdb"
+              line. */
+           valid=get_validity(pk,un->pkt->pkt.user_id);
+

             keyid_str[17] = 0; /* cut off the "[uncertain]" part */
             write_status_text_and_buffer (statno, keyid_str,
                                           un->pkt->pkt.user_id->name,
                                           un->pkt->pkt.user_id->len, 
                                           -1 );
 
             keyid_str[17] = 0; /* cut off the "[uncertain]" part */
             write_status_text_and_buffer (statno, keyid_str,
                                           un->pkt->pkt.user_id->name,
                                           un->pkt->pkt.user_id->len, 
                                           -1 );
 

-            log_info(rc? _("BAD signature from \"")
-                       : sig->flags.expired ? _("Expired signature from \"")
-                      : _("Good signature from \""));
-           print_utf8_string( log_stream(), un->pkt->pkt.user_id->name,
-                                            un->pkt->pkt.user_id->len );
-           fputs("\"\n", log_stream() );
+           p=utf8_to_native(un->pkt->pkt.user_id->name,
+                            un->pkt->pkt.user_id->len,0);
+
+           if(rc)
+             log_info(_("BAD signature from \"%s\""),p);
+           else if(sig->flags.expired)
+             log_info(_("Expired signature from \"%s\""),p);
+           else
+             log_info(_("Good signature from \"%s\""),p);
+
+           xfree(p);
+
+           if(opt.verify_options&VERIFY_SHOW_UID_VALIDITY)
+             fprintf(log_stream()," [%s]\n",trust_value_to_string(valid));
+           else
+             fputs("\n", log_stream() );

             count++;
        }
        if( !count ) {  /* just in case that we have no valid textual
                            userid */
             count++;
        }
        if( !count ) {  /* just in case that we have no valid textual
                            userid */

+           char *p;
+

            /* Try for an invalid textual userid */
             for( un=keyblock; un; un = un->next ) {
                 if( un->pkt->pkttype == PKT_USER_ID &&
            /* Try for an invalid textual userid */
             for( un=keyblock; un; un = un->next ) {
                 if( un->pkt->pkttype == PKT_USER_ID &&


@@ -1376,7 +1653,7 @@ check_sig_and_print( CTX c, KBNODE node )
                }
            }
 
                }
            }
 

-            if (opt.always_trust || !un)
+            if (opt.trust_model==TM_ALWAYS || !un)

                 keyid_str[17] = 0; /* cut off the "[uncertain]" part */
 
             write_status_text_and_buffer (statno, keyid_str,
                 keyid_str[17] = 0; /* cut off the "[uncertain]" part */
 
             write_status_text_and_buffer (statno, keyid_str,


@@ -1384,84 +1661,162 @@ check_sig_and_print( CTX c, KBNODE node )
                                           un? un->pkt->pkt.user_id->len:3, 
                                           -1 );
 
                                           un? un->pkt->pkt.user_id->len:3, 
                                           -1 );
 

-            log_info(rc? _("BAD signature from \"")
-                       : sig->flags.expired ? _("Expired signature from \"")
-                      : _("Good signature from \""));
-            if (!opt.always_trust && un) {
-                fputs(_("[uncertain]"), log_stream() );
+           if(un)
+             p=utf8_to_native(un->pkt->pkt.user_id->name,
+                               un->pkt->pkt.user_id->len,0);
+           else
+             p=xstrdup("[?]");
+
+           if(rc)
+             log_info(_("BAD signature from \"%s\""),p);
+           else if(sig->flags.expired)
+             log_info(_("Expired signature from \"%s\""),p);
+           else
+             log_info(_("Good signature from \"%s\""),p);
+            if (opt.trust_model!=TM_ALWAYS && un)
+             {

                 putc(' ', log_stream() );
                 putc(' ', log_stream() );

-            }
-            print_utf8_string( log_stream(),
-                               un? un->pkt->pkt.user_id->name:"[?]",
-                               un? un->pkt->pkt.user_id->len:3 );
-           fputs("\"\n", log_stream() );
+                fputs(_("[uncertain]"), log_stream() );
+             }
+           fputs("\n", log_stream() );

        }
 
         /* If we have a good signature and already printed 
          * the primary user ID, print all the other user IDs */
         if ( count && !rc ) {
        }
 
         /* If we have a good signature and already printed 
          * the primary user ID, print all the other user IDs */
         if ( count && !rc ) {

-           PKT_public_key *pk=NULL;
+           char *p;

             for( un=keyblock; un; un = un->next ) {
             for( un=keyblock; un; un = un->next ) {

-               if(un->pkt->pkttype==PKT_PUBLIC_KEY)
-                   pk=un->pkt->pkt.public_key;

                 if( un->pkt->pkttype != PKT_USER_ID )
                     continue;
                 if( un->pkt->pkttype != PKT_USER_ID )
                     continue;

-                if ( un->pkt->pkt.user_id->is_revoked )
-                    continue;
-                if ( un->pkt->pkt.user_id->is_expired )
-                    continue;
+                if((un->pkt->pkt.user_id->is_revoked
+                   || un->pkt->pkt.user_id->is_expired)
+                  && !(opt.verify_options&VERIFY_SHOW_UNUSABLE_UIDS))
+                 continue;

                /* Only skip textual primaries */
                 if ( un->pkt->pkt.user_id->is_primary &&
                     !un->pkt->pkt.user_id->attrib_data )
                    continue;
 
                /* Only skip textual primaries */
                 if ( un->pkt->pkt.user_id->is_primary &&
                     !un->pkt->pkt.user_id->attrib_data )
                    continue;
 

-               if(opt.show_photos && un->pkt->pkt.user_id->attrib_data)
-                 show_photos(un->pkt->pkt.user_id->attribs,
-                             un->pkt->pkt.user_id->numattribs,pk,NULL);
-
-               log_info(    _("                aka \""));
-                print_utf8_string( log_stream(), un->pkt->pkt.user_id->name,
-                                                 un->pkt->pkt.user_id->len );
-                fputs("\"\n", log_stream() );
+               if(un->pkt->pkt.user_id->attrib_data)
+                 {
+                   dump_attribs(un->pkt->pkt.user_id,pk,NULL);
+
+                   if(opt.verify_options&VERIFY_SHOW_PHOTOS)
+                     show_photos(un->pkt->pkt.user_id->attribs,
+                                 un->pkt->pkt.user_id->numattribs,pk,NULL);
+                 }
+
+               p=utf8_to_native(un->pkt->pkt.user_id->name,
+                                un->pkt->pkt.user_id->len,0);
+               log_info(_("                aka \"%s\""),p);
+               xfree(p);
+
+               if(opt.verify_options&VERIFY_SHOW_UID_VALIDITY)
+                 {
+                   const char *valid;
+                   if(un->pkt->pkt.user_id->is_revoked)
+                     valid=_("revoked");
+                   else if(un->pkt->pkt.user_id->is_expired)
+                     valid=_("expired");
+                   else
+                     valid=trust_value_to_string(get_validity(pk,
+                                                              un->pkt->
+                                                              pkt.user_id));
+                   fprintf(log_stream()," [%s]\n",valid);
+                 }
+               else
+                 fputs("\n", log_stream() );

             }
        }
        release_kbnode( keyblock );
 
        if( !rc )
             }
        }
        release_kbnode( keyblock );
 
        if( !rc )

-           print_notation_data( sig );
+         {
+           if(opt.verify_options&VERIFY_SHOW_POLICY_URLS)
+             show_policy_url(sig,0,1);
+           else
+             show_policy_url(sig,0,2);
+
+           if(opt.verify_options&VERIFY_SHOW_KEYSERVER_URLS)
+             show_keyserver_url(sig,0,1);
+           else
+             show_keyserver_url(sig,0,2);
+
+           if(opt.verify_options&VERIFY_SHOW_NOTATIONS)
+             show_notation(sig,0,1,
+                       ((opt.verify_options&VERIFY_SHOW_STD_NOTATIONS)?1:0)+
+                       ((opt.verify_options&VERIFY_SHOW_USER_NOTATIONS)?2:0));
+           else
+             show_notation(sig,0,2,0);
+         }

 
        if( !rc && is_status_enabled() ) {
            /* print a status response with the fingerprint */
 
        if( !rc && is_status_enabled() ) {
            /* print a status response with the fingerprint */

-           PKT_public_key *pk = m_alloc_clear( sizeof *pk );
+           PKT_public_key *vpk = xmalloc_clear( sizeof *vpk );

 
 

-           if( !get_pubkey( pk, sig->keyid ) ) {
+           if( !get_pubkey( vpk, sig->keyid ) ) {

                byte array[MAX_FINGERPRINT_LEN], *p;
                byte array[MAX_FINGERPRINT_LEN], *p;

-               char buf[MAX_FINGERPRINT_LEN*2+72];
+               char buf[MAX_FINGERPRINT_LEN*4+90], *bufp;

                size_t i, n;
 
                size_t i, n;
 

-               fingerprint_from_pk( pk, array, &n );
+                bufp = buf;
+               fingerprint_from_pk( vpk, array, &n );

                p = array;
                p = array;

-               for(i=0; i < n ; i++, p++ )
-                   sprintf(buf+2*i, "%02X", *p );
-               sprintf(buf+strlen(buf), " %s %lu %lu",
-                                        strtimestamp( sig->timestamp ),
-                                        (ulong)sig->timestamp,
-                                        (ulong)sig->expiredate );
+               for(i=0; i < n ; i++, p++, bufp += 2)
+                    sprintf(bufp, "%02X", *p );
+               /* TODO: Replace the reserved '0' in the field below
+                  with bits for status flags (policy url, notation,
+                  etc.).  Remember to make the buffer larger to
+                  match! */
+               sprintf(bufp, " %s %lu %lu %d 0 %d %d %02X ",
+                        strtimestamp( sig->timestamp ),
+                        (ulong)sig->timestamp,(ulong)sig->expiredate,
+                       sig->version,sig->pubkey_algo,sig->digest_algo,
+                       sig->sig_class);
+                bufp = bufp + strlen (bufp);
+                if (!vpk->is_primary) {
+                   u32 akid[2];
+ 
+                   akid[0] = vpk->main_keyid[0];
+                   akid[1] = vpk->main_keyid[1];
+                   free_public_key (vpk);
+                   vpk = xmalloc_clear( sizeof *vpk );
+                   if (get_pubkey (vpk, akid)) {
+                     /* impossible error, we simply return a zeroed out fpr */
+                     n = MAX_FINGERPRINT_LEN < 20? MAX_FINGERPRINT_LEN : 20;
+                     memset (array, 0, n);
+                   }
+                   else
+                     fingerprint_from_pk( vpk, array, &n );
+                }
+               p = array;
+               for(i=0; i < n ; i++, p++, bufp += 2)
+                    sprintf(bufp, "%02X", *p );

                write_status_text( STATUS_VALIDSIG, buf );
            }
                write_status_text( STATUS_VALIDSIG, buf );
            }

-           free_public_key( pk );
+           free_public_key( vpk );

        }
 
        }
 

-       if( !rc )
+       if (!rc)
+          {
+            pka_uri_from_sig (sig); /* Make sure PKA info is available. */

            rc = check_signatures_trust( sig );
            rc = check_signatures_trust( sig );

+          }

 
        if(sig->flags.expired)
          {
 
        if(sig->flags.expired)
          {

-           log_info("Signature expired %s\n",asctimestamp(sig->expiredate));
+           log_info(_("Signature expired %s\n"),
+                    asctimestamp(sig->expiredate));

            rc=G10ERR_GENERAL; /* need a better error here? */
          }
        else if(sig->expiredate)
            rc=G10ERR_GENERAL; /* need a better error here? */
          }
        else if(sig->expiredate)

-         log_info("Signature expires %s\n",asctimestamp(sig->expiredate));
+         log_info(_("Signature expires %s\n"),asctimestamp(sig->expiredate));
+
+       if(opt.verbose)
+         log_info(_("%s signature, digest algorithm %s\n"),
+                  sig->sig_class==0x00?_("binary"):
+                  sig->sig_class==0x01?_("textmode"):_("unknown"),
+                  digest_algo_to_string(sig->digest_algo));

 
        if( rc )
            g10_errors_seen = 1;
 
        if( rc )
            g10_errors_seen = 1;


@@ -1510,7 +1865,6 @@ proc_tree( CTX c, KBNODE node )
     if (!node)
         return;
 
     if (!node)
         return;
 

-    c->local_id = 0;

     c->trustletter = ' ';
     if( node->pkt->pkttype == PKT_PUBLIC_KEY
        || node->pkt->pkttype == PKT_PUBLIC_SUBKEY ) {
     c->trustletter = ' ';
     if( node->pkt->pkttype == PKT_PUBLIC_KEY
        || node->pkt->pkttype == PKT_PUBLIC_SUBKEY ) {


@@ -1574,6 +1928,30 @@ proc_tree( CTX c, KBNODE node )
     }
     else if( node->pkt->pkttype == PKT_SIGNATURE ) {
        PKT_signature *sig = node->pkt->pkt.signature;
     }
     else if( node->pkt->pkttype == PKT_SIGNATURE ) {
        PKT_signature *sig = node->pkt->pkt.signature;

+       int multiple_ok=1;
+
+       n1=find_next_kbnode(node, PKT_SIGNATURE);
+       if(n1)
+         {
+           byte class=sig->sig_class;
+           byte hash=sig->digest_algo;
+
+           for(; n1; (n1 = find_next_kbnode(n1, PKT_SIGNATURE)))
+             {
+               /* We can't currently handle multiple signatures of
+                  different classes or digests (we'd pretty much have
+                  to run a different hash context for each), but if
+                  they are all the same, make an exception. */
+               if(n1->pkt->pkt.signature->sig_class!=class
+                  || n1->pkt->pkt.signature->digest_algo!=hash)
+                 {
+                   multiple_ok=0;
+                   log_info(_("WARNING: multiple signatures detected.  "
+                              "Only the first will be checked.\n"));
+                   break;
+                 }
+             }
+         }

 
        if( sig->sig_class != 0x00 && sig->sig_class != 0x01 )
            log_info(_("standalone signature of class 0x%02x\n"),
 
        if( sig->sig_class != 0x00 && sig->sig_class != 0x01 )
            log_info(_("standalone signature of class 0x%02x\n"),


@@ -1596,7 +1974,7 @@ proc_tree( CTX c, KBNODE node )
                 * signature has been created in textmode */
                c->mfx.md2 = md_open( sig->digest_algo, 0 );
            }
                 * signature has been created in textmode */
                c->mfx.md2 = md_open( sig->digest_algo, 0 );
            }

-         #if 0 /* workaround disabled */
+#if 0 /* workaround disabled */

            /* Here we have another hack to work around a pgp 2 bug
             * It works by not using the textmode for detached signatures;
             * this will let the first signature check (on md) fail
            /* Here we have another hack to work around a pgp 2 bug
             * It works by not using the textmode for detached signatures;
             * this will let the first signature check (on md) fail


@@ -1605,7 +1983,7 @@ proc_tree( CTX c, KBNODE node )
             * hack but it may help in some cases (and break others)
             */
                    /*  c->mfx.md2? 0 :(sig->sig_class == 0x01) */
             * hack but it may help in some cases (and break others)
             */
                    /*  c->mfx.md2? 0 :(sig->sig_class == 0x01) */

-         #endif
+#endif

             if ( DBG_HASHING ) {
                 md_start_debug( c->mfx.md, "verify" );
                 if ( c->mfx.md2  )
             if ( DBG_HASHING ) {
                 md_start_debug( c->mfx.md, "verify" );
                 if ( c->mfx.md2  )


@@ -1635,8 +2013,11 @@ proc_tree( CTX c, KBNODE node )
        else if (!opt.quiet)
            log_info(_("old style (PGP 2.x) signature\n"));
 
        else if (!opt.quiet)
            log_info(_("old style (PGP 2.x) signature\n"));
 

-       for( n1 = node; n1; (n1 = find_next_kbnode(n1, PKT_SIGNATURE )) )
+       if(multiple_ok)
+         for( n1 = node; n1; (n1 = find_next_kbnode(n1, PKT_SIGNATURE )) )

            check_sig_and_print( c, n1 );
            check_sig_and_print( c, n1 );

+       else
+         check_sig_and_print( c, node );

     }
     else {
         dump_kbnode (c->list);
     }
     else {
         dump_kbnode (c->list);


@@ -1644,7 +2025,3 @@ proc_tree( CTX c, KBNODE node )
         dump_kbnode (node);
     }
 }
         dump_kbnode (node);
     }
 }

-
-
-
-