* packet.h, main.h, sig-check.c (signature_check2, check_key_signature2,

[gnupg.git] / g10 / mainproc.c

diff --git a/g10/mainproc.c b/g10/mainproc.c
index 6facd82..0bd1a56 100644 (file)
--- a/g10/mainproc.c
+++ b/g10/mainproc.c
@@ -1,5 +1,5 @@
 /* mainproc.c - handle packets
 /* mainproc.c - handle packets

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

  *
  * This file is part of GnuPG.
  *
  *
  * This file is part of GnuPG.
  *


@@ -25,18 +25,20 @@
 #include <assert.h>
 #include <time.h>
 
 #include <assert.h>
 #include <time.h>
 

-#include <gcrypt.h>

 #include "packet.h"
 #include "iobuf.h"
 #include "packet.h"
 #include "iobuf.h"

+#include "memory.h"

 #include "options.h"
 #include "util.h"
 #include "options.h"
 #include "util.h"

+#include "cipher.h"

 #include "keydb.h"
 #include "filter.h"
 #include "main.h"
 #include "status.h"
 #include "i18n.h"
 #include "trustdb.h"
 #include "keydb.h"
 #include "filter.h"
 #include "main.h"
 #include "status.h"
 #include "i18n.h"
 #include "trustdb.h"

-#include "hkp.h"
+#include "keyserver-internal.h"
+#include "photoid.h"

 
 
 struct kidlist_item {
 
 
 struct kidlist_item {


@@ -69,8 +71,11 @@ struct mainproc_context {
     IOBUF iobuf;    /* used to get the filename etc. */
     int trustletter; /* temp usage in list_node */
     ulong local_id;    /* ditto */
     IOBUF iobuf;    /* used to get the filename etc. */
     int trustletter; /* temp usage in list_node */
     ulong local_id;    /* ditto */

-    struct kidlist_item *failed_pkenc; /* list of packets for which
-                                          we do not have a secret key */
+    struct kidlist_item *pkenc_list;   /* list of encryption packets */
+    struct {
+        int op;
+        int stop_now;
+    } pipemode;

 };
 
 
 };
 
 


@@ -87,13 +92,18 @@ release_list( CTX c )
        return;
     proc_tree(c, c->list );
     release_kbnode( c->list );
        return;
     proc_tree(c, c->list );
     release_kbnode( c->list );

-    while( c->failed_pkenc ) {
-       struct kidlist_item *tmp = c->failed_pkenc->next;
-       gcry_free( c->failed_pkenc );
-       c->failed_pkenc = tmp;
+    while( c->pkenc_list ) {
+       struct kidlist_item *tmp = c->pkenc_list->next;
+       m_free( c->pkenc_list );
+       c->pkenc_list = tmp;

     }
     }

-    c->failed_pkenc = NULL;
+    c->pkenc_list = NULL;

     c->list = NULL;
     c->list = NULL;

+    c->have_data = 0;
+    c->last_was_session_key = 0;
+    c->pipemode.op = 0;
+    c->pipemode.stop_now = 0;
+    m_free(c->dek); c->dek = NULL;

 }
 
 
 }
 
 


@@ -103,8 +113,14 @@ add_onepass_sig( CTX c, PACKET *pkt )
     KBNODE node;
 
     if( c->list ) { /* add another packet */
     KBNODE node;
 
     if( c->list ) { /* add another packet */

-       if( c->list->pkt->pkttype != PKT_ONEPASS_SIG ) {
-          log_error("add_onepass_sig: another packet is in the way\n");
+        /* We can only append another onepass packet if the list
+         * does contain only onepass packets */
+        for( node=c->list; node && node->pkt->pkttype == PKT_ONEPASS_SIG;
+             node = node->next )
+            ;
+       if( node ) {
+            /* this is not the case, so we flush the current thing and 
+             * allow this packet to start a new verification thing */

           release_list( c );
           c->list = new_kbnode( pkt );
        }
           release_list( c );
           c->list = new_kbnode( pkt );
        }


@@ -118,6 +134,48 @@ add_onepass_sig( CTX c, PACKET *pkt )
 }
 
 
 }
 
 

+static int
+add_gpg_control( CTX c, PACKET *pkt )
+{
+    if ( pkt->pkt.gpg_control->control == CTRLPKT_CLEARSIGN_START ) {
+        /* New clear text signature.
+         * Process the last one and reset everything */
+        release_list(c);
+    }   
+    else if ( pkt->pkt.gpg_control->control == CTRLPKT_PIPEMODE ) {
+        /* Pipemode control packet */
+        if ( pkt->pkt.gpg_control->datalen < 2 ) 
+            log_fatal ("invalid pipemode control packet length\n");
+        if (pkt->pkt.gpg_control->data[0] == 1) {
+            /* start the whole thing */
+            assert ( !c->list ); /* we should be in a pretty virgin state */
+            assert ( !c->pipemode.op );
+            c->pipemode.op = pkt->pkt.gpg_control->data[1];
+        }
+        else if (pkt->pkt.gpg_control->data[0] == 2) {
+            /* the signed material follows in a plaintext packet */
+            assert ( c->pipemode.op == 'B' );
+        }
+        else if (pkt->pkt.gpg_control->data[0] == 3) {
+            assert ( c->pipemode.op == 'B' );
+            release_list (c);
+            /* and tell the outer loop to terminate */
+            c->pipemode.stop_now = 1;
+        }
+        else 
+            log_fatal ("invalid pipemode control packet code\n");
+        return 0; /* no need to store the packet */
+    }   
+
+    if( c->list )  /* add another packet */
+        add_kbnode( c->list, new_kbnode( pkt ));
+    else /* insert the first one */
+       c->list = new_kbnode( pkt );
+
+    return 1;
+}
+
+

 
 static int
 add_user_id( CTX c, PACKET *pkt )
 
 static int
 add_user_id( CTX c, PACKET *pkt )


@@ -160,11 +218,11 @@ add_signature( CTX c, PACKET *pkt )
 
     if( pkt->pkttype == PKT_SIGNATURE && !c->list ) {
        /* This is the first signature for the following datafile.
 
     if( pkt->pkttype == PKT_SIGNATURE && !c->list ) {
        /* This is the first signature for the following datafile.

-        * G10 does not write such packets; instead it always uses
+        * GPG does not write such packets; instead it always uses

         * onepass-sig packets.  The drawback of PGP's method
         * of prepending the signature to the data is
         * that it is not possible to make a signature from data read
         * onepass-sig packets.  The drawback of PGP's method
         * of prepending the signature to the data is
         * that it is not possible to make a signature from data read

-        * from stdin.  (G10 is able to read PGP stuff anyway.) */
+        * from stdin.  (GPG is able to read PGP stuff anyway.) */

        node = new_kbnode( pkt );
        c->list = node;
        return 1;
        node = new_kbnode( pkt );
        c->list = node;
        return 1;


@@ -180,6 +238,38 @@ add_signature( CTX c, PACKET *pkt )
     return 1;
 }
 
     return 1;
 }
 

+static void
+symkey_decrypt_sesskey( DEK *dek, byte *sesskey, size_t slen )
+{
+    CIPHER_HANDLE hd;
+    int n;
+
+    if ( slen < 17 || slen > 33 ) {
+        log_error ( _("weird size for an encrypted session key (%d)\n"),
+                   (int)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;
+    }
+    n = cipher_get_keylen (sesskey[0]) / 8;
+    if (n > DIM(dek->key))
+         BUG ();
+    /* 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 );*/
+}   

 
 static void
 proc_symkey_enc( CTX c, PACKET *pkt )
 
 static void
 proc_symkey_enc( CTX c, PACKET *pkt )


@@ -187,12 +277,28 @@ proc_symkey_enc( CTX c, PACKET *pkt )
     PKT_symkey_enc *enc;
 
     enc = pkt->pkt.symkey_enc;
     PKT_symkey_enc *enc;
 
     enc = pkt->pkt.symkey_enc;

-    if( enc->seskeylen )
-       log_error( "symkey_enc packet with session keys are not supported!\n");
+    if (!enc)
+        log_error ("invalid symkey encrypted packet\n");

     else {
     else {

+        int algo = enc->cipher_algo;
+       const char *s;
+
+       s = cipher_algo_to_string (algo);
+       if( s )
+           log_info(_("%s encrypted data\n"), s );
+       else
+           log_info(_("encrypted with unknown algorithm %d\n"), algo );
+

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

-       c->dek = passphrase_to_dek( NULL, 0, enc->cipher_algo, &enc->s2k, 0 );
+       if ( opt.list_only )
+           goto leave;
+       c->dek = passphrase_to_dek( NULL, 0, algo, &enc->s2k, 0, NULL, 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:

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


@@ -218,16 +324,30 @@ proc_pubkey_enc( CTX c, PACKET *pkt )
        write_status_text( STATUS_ENC_TO, buf );
     }
 
        write_status_text( STATUS_ENC_TO, buf );
     }
 

-
-    if( is_ELGAMAL(enc->pubkey_algo)
-       || enc->pubkey_algo == GCRY_PK_DSA
+    if( !opt.list_only && opt.override_session_key ) {
+       /* 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 );
+       result = get_override_session_key ( c->dek, opt.override_session_key );
+       if ( result ) {
+           m_free(c->dek); c->dek = NULL;
+       }
+    }
+    else if( is_ELGAMAL(enc->pubkey_algo)
+       || enc->pubkey_algo == PUBKEY_ALGO_DSA

        || is_RSA(enc->pubkey_algo)  ) {
        if ( !c->dek && ((!enc->keyid[0] && !enc->keyid[1])
        || is_RSA(enc->pubkey_algo)  ) {
        if ( !c->dek && ((!enc->keyid[0] && !enc->keyid[1])

+                          || opt.try_all_secrets

                          || !seckey_available( enc->keyid )) ) {
                          || !seckey_available( enc->keyid )) ) {

-           c->dek = gcry_xmalloc_secure( sizeof *c->dek );
-           if( (result = get_session_key( enc, c->dek )) ) {
-               /* error: delete the DEK */
-               gcry_free(c->dek); c->dek = NULL;
+           if( opt.list_only )
+               result = -1;
+           else {
+               c->dek = m_alloc_secure_clear( sizeof *c->dek );
+               if( (result = get_session_key( enc, c->dek )) ) {
+                   /* error: delete the DEK */
+                   m_free(c->dek); c->dek = NULL;
+               }

            }
        }
        else
            }
        }
        else


@@ -238,18 +358,30 @@ 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") );
-    }
-    else { /* store it for later display */
-       struct kidlist_item *x = gcry_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->failed_pkenc;
-       c->failed_pkenc = x;
+    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 );
+            }
+        }
+        /* 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;
+        }

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


@@ -261,12 +393,22 @@ proc_pubkey_enc( CTX c, PACKET *pkt )
  * not decrypt.
  */
 static void
  * not decrypt.
  */
 static void

-print_failed_pkenc( struct kidlist_item *list )
+print_pkenc_list( struct kidlist_item *list, int failed )

 {
     for( ; list; list = list->next ) {
 {
     for( ; list; list = list->next ) {

-       PKT_public_key *pk = gcry_xcalloc( 1, sizeof *pk );
-       const char *algstr = gcry_pk_algo_name( list->pubkey_algo );
-
+       PKT_public_key *pk;
+       const char *algstr;
+        
+        if ( failed && !list->reason )
+            continue;
+        if ( !failed && list->reason )
+            continue;
+
+        algstr = pubkey_algo_to_string( list->pubkey_algo );
+        pk = m_alloc_clear( sizeof *pk );
+
+       if( !algstr )
+           algstr = "[?]";

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


@@ -276,8 +418,8 @@ print_failed_pkenc( struct kidlist_item *list )
                       strtimestamp(pk->timestamp) );
            fputs("      \"", log_stream() );
            p = get_user_id( list->kid, &n );
                       strtimestamp(pk->timestamp) );
            fputs("      \"", log_stream() );
            p = get_user_id( list->kid, &n );

-           print_string( log_stream(), p, n, '"' );
-           gcry_free(p);
+           print_utf8_string2 ( log_stream(), p, n, '"' );
+           m_free(p);

            fputs("\"\n", log_stream() );
        }
        else {
            fputs("\"\n", log_stream() );
        }
        else {


@@ -287,7 +429,6 @@ print_failed_pkenc( struct kidlist_item *list )
        free_public_key( pk );
 
        if( list->reason == G10ERR_NO_SECKEY ) {
        free_public_key( pk );
 
        if( list->reason == G10ERR_NO_SECKEY ) {

-           log_info(_("no secret key for decryption available\n"));

            if( is_status_enabled() ) {
                char buf[20];
                sprintf(buf,"%08lX%08lX", (ulong)list->kid[0],
            if( is_status_enabled() ) {
                char buf[20];
                sprintf(buf,"%08lX%08lX", (ulong)list->kid[0],


@@ -295,8 +436,8 @@ print_failed_pkenc( struct kidlist_item *list )
                write_status_text( STATUS_NO_SECKEY, buf );
            }
        }
                write_status_text( STATUS_NO_SECKEY, buf );
            }
        }

-       else
-           log_error(_("public key decryption failed: %s\n"),
+       else if (list->reason)
+           log_info(_("public key decryption failed: %s\n"),

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


@@ -307,43 +448,79 @@ proc_encrypted( CTX c, PACKET *pkt )
 {
     int result = 0;
 
 {
     int result = 0;
 

-    print_failed_pkenc( c->failed_pkenc );
+    if (!opt.quiet) {
+        print_pkenc_list ( c->pkenc_list, 1 );
+        print_pkenc_list ( c->pkenc_list, 0 );
+    }
+
+    write_status( STATUS_BEGIN_DECRYPTION );

 
     /*log_debug("dat: %sencrypted data\n", c->dek?"":"conventional ");*/
 
     /*log_debug("dat: %sencrypted data\n", c->dek?"":"conventional ");*/

-    if( !c->dek && !c->last_was_session_key ) {
-       /* assume this is old conventional encrypted data
-        * Actually we should use IDEA and MD5 in this case, but becuase
-        * IDEA is patented we can't do so */
-       c->dek = passphrase_to_dek( NULL, 0,
-                   opt.def_cipher_algo ? opt.def_cipher_algo
-                                       : DEFAULT_CIPHER_ALGO, NULL, 0 );
+    if( opt.list_only )
+       result = -1;
+    else if( !c->dek && !c->last_was_session_key ) {
+        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"),
+                        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.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 );

-    gcry_free(c->dek); c->dek = NULL;
+
+    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 );
            write_status( STATUS_GOODMDC );

+       else if(!opt.no_mdc_warn)
+           log_info (_("WARNING: message was not integrity protected\n"));

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

+       write_status( STATUS_DECRYPTION_FAILED );

     }
     else {
        write_status( STATUS_DECRYPTION_FAILED );
        log_error(_("decryption failed: %s\n"), g10_errstr(result));
     }
     else {
        write_status( STATUS_DECRYPTION_FAILED );
        log_error(_("decryption failed: %s\n"), g10_errstr(result));

-       /* Hmmm: does this work when we have encrypted using a multiple
+       /* Hmmm: does this work when we have encrypted using multiple

         * ways to specify the session key (symmmetric and PK)*/
     }
     free_packet(pkt);
     c->last_was_session_key = 0;
         * ways to specify the session key (symmmetric and PK)*/
     }
     free_packet(pkt);
     c->last_was_session_key = 0;

+    write_status( STATUS_END_DECRYPTION );

 }
 
 
 }
 
 


@@ -360,8 +537,7 @@ proc_plaintext( CTX c, PACKET *pkt )
     else if( opt.verbose )
        log_info(_("original file name='%.*s'\n"), pt->namelen, pt->name);
     free_md_filter_context( &c->mfx );
     else if( opt.verbose )
        log_info(_("original file name='%.*s'\n"), pt->namelen, pt->name);
     free_md_filter_context( &c->mfx );

-    if( !(c->mfx.md = gcry_md_open( 0, 0)) )
-       BUG();
+    c->mfx.md = md_open( 0, 0);

     /* fixme: we may need to push the textfilter if we have sigclass 1
      * and no armoring - Not yet tested
      * Hmmm, why don't we need it at all if we have sigclass 1
     /* fixme: we may need to push the textfilter if we have sigclass 1
      * and no armoring - Not yet tested
      * Hmmm, why don't we need it at all if we have sigclass 1


@@ -372,10 +548,9 @@ proc_plaintext( CTX c, PACKET *pkt )
     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 ) {
            if( n->pkt->pkt.onepass_sig->digest_algo ) {

-               gcry_md_enable( c->mfx.md,
-                               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
                if( !any && n->pkt->pkt.onepass_sig->digest_algo

-                                                     == GCRY_MD_MD5 )
+                                                     == DIGEST_ALGO_MD5 )

                    only_md5 = 1;
                else
                    only_md5 = 0;
                    only_md5 = 1;
                else
                    only_md5 = 0;


@@ -383,49 +558,68 @@ proc_plaintext( CTX c, PACKET *pkt )
            }
            if( n->pkt->pkt.onepass_sig->sig_class != 0x01 )
                only_md5 = 0;
            }
            if( n->pkt->pkt.onepass_sig->sig_class != 0x01 )
                only_md5 = 0;

-
-           /* Check whether this is a cleartext signature.  We assume that
-            * we have one if the sig_class is 1 and the keyid is 0, that
-            * are the faked packets produced by armor.c.  There is a
-            * possibility that this fails, but there is no other easy way
-            * to do it. (We could use a special packet type to indicate
-            * this, but this may also be faked - it simply can't be verified
-            * and is _no_ security issue)
-            */
-           if( n->pkt->pkt.onepass_sig->sig_class == 0x01
-               && !n->pkt->pkt.onepass_sig->keyid[0]
-               && !n->pkt->pkt.onepass_sig->keyid[1] )
-               clearsig = 1;

        }
        }

+       else if( n->pkt->pkttype == PKT_GPG_CONTROL
+                 && n->pkt->pkt.gpg_control->control
+                    == CTRLPKT_CLEARSIGN_START ) {
+            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"); 
+            /* 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 );
+            any = 1;
+            break;  /* no pass signature pakets are expected */
+        }

     }
     }

-    if( !any ) { /* no onepass sig packet: enable all standard algos */
-       gcry_md_enable( c->mfx.md, GCRY_MD_RMD160 );
-       gcry_md_enable( c->mfx.md, GCRY_MD_SHA1 );
-       gcry_md_enable( c->mfx.md, GCRY_MD_MD5 );
+
+    if( !any && !opt.skip_verify ) {
+       /* no onepass sig packet: enable all standard algos */
+       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( only_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
         * pgp mails we could see whether there is the signature packet
         * in front of the plaintext.  If someone needs this, send me a patch.
         */
        /* 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
         * pgp mails we could see whether there is the signature packet
         * in front of the plaintext.  If someone needs this, send me a patch.
         */

-       if( !(c->mfx.md2 = gcry_md_open( GCRY_MD_MD5, 0)) )
-           BUG();
+       c->mfx.md2 = md_open( DIGEST_ALGO_MD5, 0);
+    }
+    if ( DBG_HASHING ) {
+       md_start_debug( c->mfx.md, "verify" );
+       if ( c->mfx.md2  )
+           md_start_debug( c->mfx.md2, "verify2" );

     }
     }

-  #if 0
-    #warning md_start_debug is enabled
-    md_start_debug( c->mfx.md, "verify" );
-  #endif
-    rc = handle_plaintext( pt, &c->mfx, c->sigs_only, clearsig );
-    if( rc == G10ERR_CREATE_FILE && !c->sigs_only) {
-       /* can't write output but we hash it anyway to
-        * check the signature */
-       rc = handle_plaintext( pt, &c->mfx, 1, clearsig );
+    if ( c->pipemode.op == 'B' )
+        rc = handle_plaintext( pt, &c->mfx, 1, 0 );
+    else {
+        rc = handle_plaintext( pt, &c->mfx, c->sigs_only, clearsig );
+        if( rc == G10ERR_CREATE_FILE && !c->sigs_only) {
+            /* can't write output but we hash it anyway to
+             * check the signature */
+            rc = handle_plaintext( pt, &c->mfx, 1, clearsig );
+        }

     }
     if( rc )
        log_error( "handle plaintext failed: %s\n", g10_errstr(rc));
     free_packet(pkt);
     c->last_was_session_key = 0;
     }
     if( rc )
        log_error( "handle plaintext failed: %s\n", g10_errstr(rc));
     free_packet(pkt);
     c->last_was_session_key = 0;

+
+    /* We add a marker control packet instead of the plaintext packet.
+     * This is so that we can later detect invalid packet sequences.
+     */
+    n = new_kbnode (create_gpg_control (CTRLPKT_PLAINTEXT_MARK, NULL, 0));
+    if (c->list)
+        add_kbnode (c->list, n);
+    else 
+        c->list = n;

 }
 
 
 }
 
 


@@ -466,11 +660,15 @@ 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 )
+do_check_sig( CTX c, KBNODE node, int *is_selfsig, int *is_expkey )

 {
     PKT_signature *sig;
 {
     PKT_signature *sig;

-    GCRY_MD_HD md = NULL, md2 = NULL;
-    int algo, rc;
+    MD_HANDLE md = NULL, md2 = NULL;
+    int algo, rc, dum2;
+    u32 dummy;
+
+    if(!is_expkey)
+      is_expkey=&dum2;

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


@@ -478,41 +676,44 @@ do_check_sig( CTX c, KBNODE node, int *is_selfsig )
     sig = node->pkt->pkt.signature;
 
     algo = sig->digest_algo;
     sig = node->pkt->pkt.signature;
 
     algo = sig->digest_algo;

-    if( (rc=openpgp_md_test_algo(algo)) )
+    if( (rc=check_digest_algo(algo)) )

        return rc;
 
     if( sig->sig_class == 0x00 ) {
        if( c->mfx.md )
        return rc;
 
     if( sig->sig_class == 0x00 ) {
        if( c->mfx.md )

-           md = gcry_md_copy( c->mfx.md );
+           md = md_copy( c->mfx.md );

        else /* detached signature */
        else /* detached signature */

-           md = gcry_md_open( 0, 0 ); /* signature_check() will enable the md*/
-       if( !md )
-           BUG();
+           md = md_open( 0, 0 ); /* signature_check() will enable the md*/

     }
     else if( sig->sig_class == 0x01 ) {
        /* how do we know that we have to hash the (already hashed) text
         * in canonical mode ??? (calculating both modes???) */
        if( c->mfx.md ) {
     }
     else if( sig->sig_class == 0x01 ) {
        /* how do we know that we have to hash the (already hashed) text
         * in canonical mode ??? (calculating both modes???) */
        if( c->mfx.md ) {

-           md = gcry_md_copy( c->mfx.md );
+           md = md_copy( c->mfx.md );

            if( c->mfx.md2 )
            if( c->mfx.md2 )

-               md2 = gcry_md_copy( c->mfx.md2 );
+              md2 = md_copy( c->mfx.md2 );

        }
        else { /* detached signature */
          log_debug("Do we really need this here?");
        }
        else { /* detached signature */
          log_debug("Do we really need this here?");

-           md = gcry_md_open( 0, 0 ); /* signature_check() will enable the md*/
-           md2 = gcry_md_open( 0, 0 );
-           if( !md || !md2 )
-               BUG();
+           md = md_open( 0, 0 ); /* signature_check() will enable the md*/
+           md2 = md_open( 0, 0 );

        }
     }
     else if( (sig->sig_class&~3) == 0x10
             || sig->sig_class == 0x18
        }
     }
     else if( (sig->sig_class&~3) == 0x10
             || sig->sig_class == 0x18

+             || sig->sig_class == 0x1f

             || sig->sig_class == 0x20
             || sig->sig_class == 0x20

-            || sig->sig_class == 0x30  ) { /* classes 0x10..0x17,0x20,0x30 */
+            || sig->sig_class == 0x28
+            || sig->sig_class == 0x30  ) { 

        if( c->list->pkt->pkttype == PKT_PUBLIC_KEY
            || c->list->pkt->pkttype == PKT_PUBLIC_SUBKEY ) {
            return check_key_signature( c->list, node, is_selfsig );
        }
        if( c->list->pkt->pkttype == PKT_PUBLIC_KEY
            || c->list->pkt->pkttype == PKT_PUBLIC_SUBKEY ) {
            return check_key_signature( c->list, node, is_selfsig );
        }

+       else if( sig->sig_class == 0x20 ) {
+           log_info(_("standalone revocation - "
+                      "use \"gpg --import\" to apply\n"));
+           return G10ERR_NOT_PROCESSED;
+       }

        else {
            log_error("invalid root packet for sigclass %02x\n",
                                                        sig->sig_class);
        else {
            log_error("invalid root packet for sigclass %02x\n",
                                                        sig->sig_class);


@@ -521,11 +722,11 @@ do_check_sig( CTX c, KBNODE node, int *is_selfsig )
     }
     else
        return G10ERR_SIG_CLASS;
     }
     else
        return G10ERR_SIG_CLASS;

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

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

-       rc = signature_check( sig, md2 );
-    gcry_md_close(md);
-    gcry_md_close(md2);
+       rc = signature_check2( sig, md2, &dummy, is_expkey, NULL );
+    md_close(md);
+    md_close(md2);

 
     return rc;
 }
 
     return rc;
 }


@@ -540,86 +741,19 @@ print_userid( PACKET *pkt )
        printf("ERROR: unexpected packet type %d", pkt->pkttype );
        return;
     }
        printf("ERROR: unexpected packet type %d", pkt->pkttype );
        return;
     }

-    print_string( stdout,  pkt->pkt.user_id->name, pkt->pkt.user_id->len,
-                                                       opt.with_colons );
-}
-
-
-static void
-print_fingerprint( PKT_public_key *pk, PKT_secret_key *sk )
-{
-    byte array[MAX_FINGERPRINT_LEN], *p;
-    size_t i, n;
-
-    if( sk )
-       fingerprint_from_sk( sk, array, &n );
+    if( opt.with_colons )
+      {
+       if(pkt->pkt.user_id->attrib_data)
+         printf("%u %lu",
+                pkt->pkt.user_id->numattribs,
+                pkt->pkt.user_id->attrib_len);
+       else
+         print_string( stdout,  pkt->pkt.user_id->name,
+                       pkt->pkt.user_id->len, ':');
+      }

     else
     else

-       fingerprint_from_pk( pk, array, &n );
-    p = array;
-    if( opt.with_colons ) {
-       printf("fpr:::::::::");
-       for(i=0; i < n ; i++, p++ )
-           printf("%02X", *p );
-       putchar(':');
-    }
-    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] );
-           }
-       }
-       else {
-           for(i=0; i < n ; i++, p++ ) {
-               if( i && !(i%8) )
-                   putchar(' ');
-               printf(" %02X", *p );
-           }
-       }
-    }
-    putchar('\n');
-}
-
-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_data, SIGSUBPKT_NOTATION,
-                                &n, &seq )) ) {
-       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() );
-    }
-    if( (p = parse_sig_subpkt( sig->hashed_data, SIGSUBPKT_POLICY, &n ) )) {
-       log_info(_("Policy: ") );
-       print_string( log_stream(), p, n, 0 );
-       putc( '\n', log_stream() );
-    }
-
-    /* Now check wheter the key of this signature has some
-     * notation data */
-
-    /* TODO */
+       print_utf8_string( stdout,  pkt->pkt.user_id->name,
+                                    pkt->pkt.user_id->len );

 }
 
 
 }
 
 


@@ -644,26 +778,28 @@ list_node( CTX c, KBNODE node )
            keyid_from_pk( pk, keyid );
            if( mainkey ) {
                c->local_id = pk->local_id;
            keyid_from_pk( pk, keyid );
            if( mainkey ) {
                c->local_id = pk->local_id;

-               c->trustletter = query_trust_info( pk, NULL );
+               c->trustletter = opt.fast_list_mode?
+                                          0 : get_validity_info( pk, NULL );

            }
            }

-           printf("%s:%c:%u:%d:%08lX%08lX:%s:%s:",
-                   mainkey? "pub":"sub",
-                   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],
                    nbits_from_pk( pk ),
                    pk->pubkey_algo,
                    (ulong)keyid[0],(ulong)keyid[1],

-                   datestr_from_pk( pk ),
-                   pk->expiredate? strtimestamp(pk->expiredate):"" );
+                   colon_datestr_from_pk( pk ),
+                   colon_strtime (pk->expiredate) );

            if( c->local_id )
                printf("%lu", c->local_id );
            putchar(':');
            if( c->local_id )
                printf("%lu", c->local_id );
            putchar(':');

-           if( c->local_id )
-               putchar( get_ownertrust_info( c->local_id ) );
+           if( mainkey && !opt.fast_list_mode )
+                 putchar( get_ownertrust_info (pk) );

            putchar(':');
            if( node->next && node->next->pkt->pkttype == PKT_RING_TRUST) {
                putchar('\n'); any=1;
                if( opt.fingerprint )
            putchar(':');
            if( node->next && node->next->pkt->pkttype == PKT_RING_TRUST) {
                putchar('\n'); any=1;
                if( opt.fingerprint )

-                   print_fingerprint( pk, NULL );
+                   print_fingerprint( pk, NULL, 0 );

                printf("rtv:1:%u:\n",
                            node->next->pkt->pkt.ring_trust->trustval );
            }
                printf("rtv:1:%u:\n",
                            node->next->pkt->pkt.ring_trust->trustval );
            }


@@ -675,6 +811,7 @@ list_node( CTX c, KBNODE node )
                                      pubkey_letter( pk->pubkey_algo ),
                                      (ulong)keyid_from_pk( pk, NULL ),
                                      datestr_from_pk( pk )     );
                                      pubkey_letter( pk->pubkey_algo ),
                                      (ulong)keyid_from_pk( pk, NULL ),
                                      datestr_from_pk( pk )     );

+

        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 ) {


@@ -691,7 +828,8 @@ list_node( CTX c, KBNODE node )
                else if( node->pkt->pkttype == PKT_USER_ID ) {
                    if( any ) {
                        if( opt.with_colons )
                else if( node->pkt->pkttype == PKT_USER_ID ) {
                    if( any ) {
                        if( opt.with_colons )

-                           printf("uid:::::::::");
+                           printf("%s:::::::::",
+                             node->pkt->pkt.user_id->attrib_data?"uat":"uid");

                        else
                            printf( "uid%*s", 28, "" );
                    }
                        else
                            printf( "uid%*s", 28, "" );
                    }


@@ -700,7 +838,7 @@ list_node( CTX c, KBNODE node )
                        putchar(':');
                    putchar('\n');
                    if( opt.fingerprint && !any )
                        putchar(':');
                    putchar('\n');
                    if( opt.fingerprint && !any )

-                       print_fingerprint( pk, NULL );
+                       print_fingerprint( pk, NULL, 0 );

                    if( node->next
                        && node->next->pkt->pkttype == PKT_RING_TRUST ) {
                        printf("rtv:2:%u:\n",
                    if( node->next
                        && node->next->pkt->pkttype == PKT_RING_TRUST ) {
                        printf("rtv:2:%u:\n",


@@ -717,10 +855,14 @@ list_node( CTX c, KBNODE node )
                }
            }
        }
                }
            }
        }

+       else if( pk->expiredate ) { /* of subkey */
+           printf(_(" [expires: %s]"), expirestr_from_pk( pk ) );
+       }
+

        if( !any )
            putchar('\n');
        if( !mainkey && opt.fingerprint > 1 )
        if( !any )
            putchar('\n');
        if( !mainkey && opt.fingerprint > 1 )

-           print_fingerprint( pk, NULL );
+           print_fingerprint( pk, NULL, 0 );

     }
     else if( (mainkey = (node->pkt->pkttype == PKT_SECRET_KEY) )
             || node->pkt->pkttype == PKT_SECRET_SUBKEY ) {
     }
     else if( (mainkey = (node->pkt->pkttype == PKT_SECRET_KEY) )
             || node->pkt->pkttype == PKT_SECRET_SUBKEY ) {


@@ -734,8 +876,8 @@ list_node( CTX c, KBNODE node )
                    nbits_from_sk( sk ),
                    sk->pubkey_algo,
                    (ulong)keyid[0],(ulong)keyid[1],
                    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 */ );
        }
        else
                    /* fixme: add LID */ );
        }
        else


@@ -761,7 +903,8 @@ list_node( CTX c, KBNODE node )
                else if( node->pkt->pkttype == PKT_USER_ID ) {
                    if( any ) {
                        if( opt.with_colons )
                else if( node->pkt->pkttype == PKT_USER_ID ) {
                    if( any ) {
                        if( opt.with_colons )

-                           printf("uid:::::::::");
+                           printf("%s:::::::::",
+                             node->pkt->pkt.user_id->attrib_data?"uat":"uid");

                        else
                            printf( "uid%*s", 28, "" );
                    }
                        else
                            printf( "uid%*s", 28, "" );
                    }


@@ -770,7 +913,7 @@ list_node( CTX c, KBNODE node )
                        putchar(':');
                    putchar('\n');
                    if( opt.fingerprint && !any )
                        putchar(':');
                    putchar('\n');
                    if( opt.fingerprint && !any )

-                       print_fingerprint( NULL, sk );
+                       print_fingerprint( NULL, sk, 0 );

                    any=1;
                }
                else if( node->pkt->pkttype == PKT_SECRET_SUBKEY ) {
                    any=1;
                }
                else if( node->pkt->pkttype == PKT_SECRET_SUBKEY ) {


@@ -785,7 +928,7 @@ list_node( CTX c, KBNODE node )
        if( !any )
            putchar('\n');
        if( !mainkey && opt.fingerprint > 1 )
        if( !any )
            putchar('\n');
        if( !mainkey && opt.fingerprint > 1 )

-           print_fingerprint( NULL, sk );
+           print_fingerprint( NULL, sk, 0 );

     }
     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;


@@ -804,10 +947,11 @@ 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 )) ) {
+           switch( (rc2=do_check_sig( c, node, &is_selfsig, NULL )) ) {

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

-             case G10ERR_NO_PUBKEY:   sigrc = '?'; break;
+             case G10ERR_NO_PUBKEY: 
+             case G10ERR_UNU_PUBKEY:  sigrc = '?'; break;

              default:                 sigrc = '%'; break;
            }
        }
              default:                 sigrc = '%'; break;
            }
        }


@@ -829,9 +973,19 @@ 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], 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
            printf("%c       %08lX %s   ",
        }
        else
            printf("%c       %08lX %s   ",


@@ -847,13 +1001,13 @@ list_node( CTX c, KBNODE node )
            if( opt.with_colons )
                putchar(':');
        }
            if( opt.with_colons )
                putchar(':');
        }

-       else {
+       else if( !opt.fast_list_mode ) {

            p = get_user_id( sig->keyid, &n );
            print_string( stdout, p, n, opt.with_colons );
            p = get_user_id( sig->keyid, &n );
            print_string( stdout, p, n, opt.with_colons );

-           gcry_free(p);
+           m_free(p);

        }
        if( opt.with_colons )
        }
        if( opt.with_colons )

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

        putchar('\n');
     }
     else
        putchar('\n');
     }
     else


@@ -861,23 +1015,26 @@ list_node( CTX c, KBNODE node )
 }
 
 
 }
 
 

+

 int
 proc_packets( void *anchor, IOBUF a )
 {
     int rc;
 int
 proc_packets( void *anchor, IOBUF a )
 {
     int rc;

-    CTX c = gcry_xcalloc( 1, sizeof *c );
+    CTX c = m_alloc_clear( sizeof *c );

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

-    gcry_free( c );
+    m_free( c );

     return rc;
 }
 
     return rc;
 }
 

+
+

 int
 proc_signature_packets( void *anchor, IOBUF a,
                        STRLIST signedfiles, const char *sigfilename )
 {
 int
 proc_signature_packets( void *anchor, IOBUF a,
                        STRLIST signedfiles, const char *sigfilename )
 {

-    CTX c = gcry_xcalloc( 1, sizeof *c );
+    CTX c = m_alloc_clear( sizeof *c );

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


@@ -885,20 +1042,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 );

-    gcry_free( c );
+    m_free( c );

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

-    CTX c = gcry_xcalloc( 1, sizeof *c );
+    CTX c = m_alloc_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 );

-    gcry_free( c );
+    m_free( c );

     return rc;
 }
 
     return rc;
 }
 


@@ -906,7 +1063,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 = gcry_xmalloc( sizeof *pkt );
+    PACKET *pkt = m_alloc( sizeof *pkt );

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


@@ -917,7 +1074,9 @@ do_proc_packets( CTX c, IOBUF a )
        any_data = 1;
        if( rc ) {
            free_packet(pkt);
        any_data = 1;
        if( rc ) {
            free_packet(pkt);

-           if( rc == G10ERR_INVALID_PACKET )
+            /* stop processing when an invalid packet has been encountered
+             * but don't do so when we are doing a --list-packet. */
+           if( rc == G10ERR_INVALID_PACKET && opt.list_packets != 2 )

                break;
            continue;
        }
                break;
            continue;
        }


@@ -941,12 +1100,14 @@ do_proc_packets( CTX c, IOBUF a )
              case PKT_PUBKEY_ENC:
              case PKT_ENCRYPTED:
              case PKT_ENCRYPTED_MDC:
              case PKT_PUBKEY_ENC:
              case PKT_ENCRYPTED:
              case PKT_ENCRYPTED_MDC:

+                write_status_text( STATUS_UNEXPECTED, "0" );

                rc = G10ERR_UNEXPECTED;
                goto leave;
              case PKT_SIGNATURE:   newpkt = add_signature( c, pkt ); break;
              case PKT_PLAINTEXT:   proc_plaintext( c, pkt ); break;
              case PKT_COMPRESSED:  proc_compressed( c, pkt ); break;
              case PKT_ONEPASS_SIG: newpkt = add_onepass_sig( c, pkt ); break;
                rc = G10ERR_UNEXPECTED;
                goto leave;
              case PKT_SIGNATURE:   newpkt = add_signature( c, pkt ); break;
              case PKT_PLAINTEXT:   proc_plaintext( c, pkt ); break;
              case PKT_COMPRESSED:  proc_compressed( c, pkt ); break;
              case PKT_ONEPASS_SIG: newpkt = add_onepass_sig( c, pkt ); break;

+              case PKT_GPG_CONTROL: newpkt = add_gpg_control(c, pkt); break;

              default: newpkt = 0; break;
            }
        }
              default: newpkt = 0; break;
            }
        }


@@ -955,6 +1116,7 @@ do_proc_packets( CTX c, IOBUF a )
              case PKT_PUBLIC_KEY:
              case PKT_SECRET_KEY:
              case PKT_USER_ID:
              case PKT_PUBLIC_KEY:
              case PKT_SECRET_KEY:
              case PKT_USER_ID:

+                write_status_text( STATUS_UNEXPECTED, "0" );

                rc = G10ERR_UNEXPECTED;
                goto leave;
              case PKT_SIGNATURE:   newpkt = add_signature( c, pkt ); break;
                rc = G10ERR_UNEXPECTED;
                goto leave;
              case PKT_SIGNATURE:   newpkt = add_signature( c, pkt ); break;


@@ -965,6 +1127,7 @@ do_proc_packets( CTX c, IOBUF a )
              case PKT_PLAINTEXT:   proc_plaintext( c, pkt ); break;
              case PKT_COMPRESSED:  proc_compressed( c, pkt ); break;
              case PKT_ONEPASS_SIG: newpkt = add_onepass_sig( c, pkt ); break;
              case PKT_PLAINTEXT:   proc_plaintext( c, pkt ); break;
              case PKT_COMPRESSED:  proc_compressed( c, pkt ); break;
              case PKT_ONEPASS_SIG: newpkt = add_onepass_sig( c, pkt ); break;

+             case PKT_GPG_CONTROL: newpkt = add_gpg_control(c, pkt); break;

              default: newpkt = 0; break;
            }
        }
              default: newpkt = 0; break;
            }
        }


@@ -989,21 +1152,36 @@ do_proc_packets( CTX c, IOBUF a )
              case PKT_PLAINTEXT:   proc_plaintext( c, pkt ); break;
              case PKT_COMPRESSED:  proc_compressed( c, pkt ); break;
              case PKT_ONEPASS_SIG: newpkt = add_onepass_sig( c, pkt ); break;
              case PKT_PLAINTEXT:   proc_plaintext( c, pkt ); break;
              case PKT_COMPRESSED:  proc_compressed( c, pkt ); break;
              case PKT_ONEPASS_SIG: newpkt = add_onepass_sig( c, pkt ); break;

+              case PKT_GPG_CONTROL: newpkt = add_gpg_control(c, pkt); break;

              case PKT_RING_TRUST:  newpkt = add_ring_trust( c, pkt ); break;
              default: newpkt = 0; break;
            }
        }
              case PKT_RING_TRUST:  newpkt = add_ring_trust( c, pkt ); break;
              default: newpkt = 0; break;
            }
        }

-       if( pkt->pkttype != PKT_SIGNATURE )
+        /* This is a very ugly construct and frankly, I don't remember why
+         * I used it.  Adding the MDC check here is a hack.
+         * The right solution is to initiate another context for encrypted
+         * packet and not to reuse the current one ...  It works right
+         * when there is a compression packet inbetween which adds just
+         * an extra layer.
+         * Hmmm: Rewrite this whole module here?? 
+         */
+       if( pkt->pkttype != PKT_SIGNATURE && pkt->pkttype != PKT_MDC )

            c->have_data = pkt->pkttype == PKT_PLAINTEXT;
 
        if( newpkt == -1 )
            ;
        else if( newpkt ) {
            c->have_data = pkt->pkttype == PKT_PLAINTEXT;
 
        if( newpkt == -1 )
            ;
        else if( newpkt ) {

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

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

+        if ( c->pipemode.stop_now ) {
+            /* we won't get an EOF in pipemode, so we have to 
+             * break the loop here */ 
+            rc = -1;
+            break;
+        }

     }
     if( rc == G10ERR_INVALID_PACKET )
        write_status_text( STATUS_NODATA, "3" );
     }
     if( rc == G10ERR_INVALID_PACKET )
        write_status_text( STATUS_NODATA, "3" );


@@ -1015,9 +1193,9 @@ do_proc_packets( CTX c, IOBUF a )
 
   leave:
     release_list( c );
 
   leave:
     release_list( c );

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

     free_packet( pkt );
     free_packet( pkt );

-    gcry_free( pkt );
+    m_free( pkt );

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


@@ -1027,77 +1205,278 @@ static int
 check_sig_and_print( CTX c, KBNODE node )
 {
     PKT_signature *sig = node->pkt->pkt.signature;
 check_sig_and_print( CTX c, KBNODE node )
 {
     PKT_signature *sig = node->pkt->pkt.signature;

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

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

+    /* It is not in all cases possible to check multiple signatures:
+     * PGP 2 (which is also allowed by OpenPGP), does use the packet
+     * sequence: sig+data,  OpenPGP does use onepas+data=sig and GnuPG
+     * sometimes uses (because I did'nt read the specs right) data+sig.
+     * Because it is possible to create multiple signatures with
+     * different packet sequence (e.g. data+sig and sig+data) it might
+     * not be possible to get it right:  let's say we have:
+     * data+sig, sig+data,sig+data and we have not yet encountered the last
+     * data, we could also see this a one data with 2 signatures and then 
+     * data+sig.
+     * To protect against this we check that all signatures follow
+     * without any intermediate packets.  Note, that we won't get this
+     * error when we use onepass packets or cleartext signatures because
+     * we reset the list every time
+     *
+     * FIXME: Now that we have these marker packets, we should create a 
+     * real grammar and check against this.
+     */
+    {
+        KBNODE n;
+        int n_sig=0;
+
+        for (n=c->list; n; n=n->next ) {
+            if ( n->pkt->pkttype == PKT_SIGNATURE ) 
+                n_sig++;
+        }
+        if (n_sig > 1) { /* more than one signature - check sequence */
+            int tmp, onepass;
+
+            for (tmp=onepass=0,n=c->list; n; n=n->next ) {
+                if (n->pkt->pkttype == PKT_ONEPASS_SIG) 
+                    onepass++;
+                else if (n->pkt->pkttype == PKT_GPG_CONTROL
+                         && n->pkt->pkt.gpg_control->control
+                            == CTRLPKT_CLEARSIGN_START ) {
+                    onepass++; /* handle the same way as a onepass */
+                }
+                else if ( (tmp && n->pkt->pkttype != PKT_SIGNATURE) ) {
+                    log_error(_("can't handle these multiple signatures\n"));
+                    return 0;
+                }
+                else if ( n->pkt->pkttype == PKT_SIGNATURE ) 
+                    tmp = 1;
+                else if (!tmp && !onepass 
+                         && n->pkt->pkttype == PKT_GPG_CONTROL
+                         && n->pkt->pkt.gpg_control->control
+                            == CTRLPKT_PLAINTEXT_MARK ) {
+                    /* plaintext before signatures but no one-pass packets*/
+                    log_error(_("can't handle these multiple signatures\n"));
+                    return 0;
+                }
+            }
+        }
+    }
+

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

+    astr = pubkey_algo_to_string( sig->pubkey_algo );

     log_info(_("Signature made %.*s using %s key ID %08lX\n"),
     log_info(_("Signature made %.*s using %s key ID %08lX\n"),

-           (int)strlen(tstr), tstr, gcry_pk_algo_name( sig->pubkey_algo ),
-                                                     (ulong)sig->keyid[1] );
+           (int)strlen(tstr), tstr, astr? astr: "?", (ulong)sig->keyid[1] );

 
 

-    rc = do_check_sig(c, node, NULL );
-    if( rc == G10ERR_NO_PUBKEY && opt.keyserver_name ) {
-       if( !hkp_ask_import( sig->keyid ) )
-           rc = do_check_sig(c, node, NULL );
+    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 the key still isn't found, try to inform the user where it
+       can be found. */
+
+    if(rc==G10ERR_NO_PUBKEY && opt.verify_options&VERIFY_SHOW_KEYSERVER)
+      {
+       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_string( log_stream(), p, n, 0 );
+           putc( '\n', log_stream() );
+         }
+      }
+

     if( !rc || rc == G10ERR_BAD_SIGN ) {
        KBNODE un, keyblock;
     if( !rc || rc == G10ERR_BAD_SIGN ) {
        KBNODE un, keyblock;

-       char *us;
-       int count=0;
+       int count=0, statno;
+        char keyid_str[50];
+
+       if(rc)
+         statno=STATUS_BADSIG;
+       else if(sig->flags.expired)
+         statno=STATUS_EXPSIG;
+       else if(is_expkey)
+         statno=STATUS_EXPKEYSIG;
+       else
+         statno=STATUS_GOODSIG;

 
        keyblock = get_pubkeyblock( sig->keyid );
 
 
        keyblock = get_pubkeyblock( sig->keyid );
 

-       us = get_long_user_id_string( sig->keyid );
-       write_status_text( rc? STATUS_BADSIG : STATUS_GOODSIG, us );
-       gcry_free(us);
+        sprintf (keyid_str, "%08lX%08lX [uncertain] ",
+                 (ulong)sig->keyid[0], (ulong)sig->keyid[1]);

 
 

-       /* fixme: list only user ids which are valid and add information
-        *        about the trustworthiness of each user id, sort them.
-        *        Integrate this with check_signatures_trust(). */
+        /* find and print the primary user ID */

        for( un=keyblock; un; un = un->next ) {
            if( un->pkt->pkttype != PKT_USER_ID )
                continue;
        for( un=keyblock; un; un = un->next ) {
            if( un->pkt->pkttype != PKT_USER_ID )
                continue;

-           if( !count++ )
-               log_info(rc? _("BAD signature from \"")
-                          : _("Good signature from \""));
-           else
-               log_info(    _("                aka \""));
+           if ( !un->pkt->pkt.user_id->created )
+               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_primary )
+               continue;
+           /* We want the textual user ID here */
+           if ( un->pkt->pkt.user_id->attrib_data )
+               continue;
+            
+            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() );
            print_utf8_string( log_stream(), un->pkt->pkt.user_id->name,
                                             un->pkt->pkt.user_id->len );
            fputs("\"\n", log_stream() );

-           if( rc )
-               break; /* print only one id in this case */
+            count++;

        }
        }

-       if( !count ) {  /* just in case that we have no userid */
-           log_info(rc? _("BAD signature from \"")
+       if( !count ) {  /* just in case that we have no valid textual
+                           userid */
+           /* Try for an invalid textual userid */
+            for( un=keyblock; un; un = un->next ) {
+                if( un->pkt->pkttype == PKT_USER_ID &&
+                   !un->pkt->pkt.user_id->attrib_data )
+                    break;
+            }
+
+           /* Try for any userid at all */
+           if(!un) {
+               for( un=keyblock; un; un = un->next ) {
+                    if( un->pkt->pkttype == PKT_USER_ID )
+                        break;
+               }
+           }
+
+            if (opt.trust_model==TM_ALWAYS || !un)
+                keyid_str[17] = 0; /* cut off the "[uncertain]" part */
+
+            write_status_text_and_buffer (statno, keyid_str,
+                                          un? un->pkt->pkt.user_id->name:"[?]",
+                                          un? un->pkt->pkt.user_id->len:3, 
+                                          -1 );
+
+            log_info(rc? _("BAD signature from \"")
+                       : sig->flags.expired ? _("Expired signature from \"")

                       : _("Good signature from \""));
                       : _("Good signature from \""));

-           fputs("[?]\"\n", log_stream() );
+            if (opt.trust_model!=TM_ALWAYS && un) {
+                fputs(_("[uncertain]"), 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() );
+       }
+
+        /* 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;
+            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->pkt.user_id->is_revoked )
+                    continue;
+                if ( un->pkt->pkt.user_id->is_expired )
+                    continue;
+               /* Only skip textual primaries */
+                if ( un->pkt->pkt.user_id->is_primary &&
+                    !un->pkt->pkt.user_id->attrib_data )
+                   continue;
+
+               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);
+                 }
+
+               log_info(    _("                aka \""));
+                print_utf8_string( log_stream(), un->pkt->pkt.user_id->name,
+                                                 un->pkt->pkt.user_id->len );
+                fputs("\"\n", log_stream() );
+            }

        }
        release_kbnode( keyblock );
        }
        release_kbnode( keyblock );

+

        if( !rc )
        if( !rc )

-           print_notation_data( sig );
+         {
+           if(opt.verify_options&VERIFY_SHOW_POLICY)
+             show_policy_url(sig,0,1);
+           else
+             show_policy_url(sig,0,2);
+
+           if(opt.verify_options&VERIFY_SHOW_NOTATION)
+             show_notation(sig,0,1);
+           else
+             show_notation(sig,0,2);
+         }

 
        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 = gcry_xcalloc( 1, sizeof *pk );
+           PKT_public_key *pk = m_alloc_clear( sizeof *pk );

 
            if( !get_pubkey( pk, sig->keyid ) ) {
                byte array[MAX_FINGERPRINT_LEN], *p;
 
            if( !get_pubkey( pk, sig->keyid ) ) {
                byte array[MAX_FINGERPRINT_LEN], *p;

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

                size_t i, n;
 
                size_t i, n;
 

+                bufp = buf;

                fingerprint_from_pk( pk, array, &n );
                p = array;
                fingerprint_from_pk( pk, array, &n );
                p = array;

-               for(i=0; i < n ; i++, p++ )
-                   sprintf(buf+2*i, "%02X", *p );
-               sprintf(buf+strlen(buf), " %s %lu",
-                                        strtimestamp( sig->timestamp ),
-                                        (ulong)sig->timestamp );
+               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 (!pk->is_primary) {
+                   u32 akid[2];
+ 
+                   akid[0] = pk->main_keyid[0];
+                   akid[1] = pk->main_keyid[1];
+                   free_public_key (pk);
+                   pk = m_alloc_clear( sizeof *pk );
+                   if (get_pubkey (pk, 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( pk, array, &n );
+                }
+               p = array;
+               for(i=0; i < n ; i++, p++, bufp += 2)
+                    sprintf(bufp, "%02X", *p );

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


@@ -1105,6 +1484,22 @@ check_sig_and_print( CTX c, KBNODE node )
 
        if( !rc )
            rc = check_signatures_trust( sig );
 
        if( !rc )
            rc = check_signatures_trust( sig );

+
+       if(sig->flags.expired)
+         {
+           log_info(_("Signature expired %s\n"),
+                    asctimestamp(sig->expiredate));
+           rc=G10ERR_GENERAL; /* need a better error here? */
+         }
+       else if(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( opt.batch && rc )
        if( rc )
            g10_errors_seen = 1;
        if( opt.batch && rc )


@@ -1121,7 +1516,8 @@ check_sig_and_print( CTX c, KBNODE node )
            buf[16] = 0;
            write_status_text( STATUS_NO_PUBKEY, buf );
        }
            buf[16] = 0;
            write_status_text( STATUS_NO_PUBKEY, buf );
        }

-       log_error(_("Can't check signature: %s\n"), g10_errstr(rc) );
+       if( rc != G10ERR_NOT_PROCESSED )
+           log_error(_("Can't check signature: %s\n"), g10_errstr(rc) );

     }
     return rc;
 }
     }
     return rc;
 }


@@ -1136,9 +1532,21 @@ proc_tree( CTX c, KBNODE node )
     KBNODE n1;
     int rc;
 
     KBNODE n1;
     int rc;
 

-    if( opt.list_packets )
+    if( opt.list_packets || opt.list_only )

        return;
 
        return;
 

+    /* we must skip our special plaintext marker packets here becuase
+       they may be the root packet.  These packets are only used in
+       addionla checks and skipping them here doesn't matter */
+    while ( node
+            && node->pkt->pkttype == PKT_GPG_CONTROL
+            && node->pkt->pkt.gpg_control->control
+                         == CTRLPKT_PLAINTEXT_MARK ) {
+        node = node->next;
+    }
+    if (!node)
+        return;
+

     c->local_id = 0;
     c->trustletter = ' ';
     if( node->pkt->pkttype == PKT_PUBLIC_KEY
     c->local_id = 0;
     c->trustletter = ' ';
     if( node->pkt->pkttype == PKT_PUBLIC_KEY


@@ -1155,52 +1563,101 @@ proc_tree( CTX c, KBNODE node )
        if( !c->have_data ) {
            free_md_filter_context( &c->mfx );
            /* prepare to create all requested message digests */
        if( !c->have_data ) {
            free_md_filter_context( &c->mfx );
            /* prepare to create all requested message digests */

-           if( !(c->mfx.md = gcry_md_open(0, 0)) )
-               BUG();
+           c->mfx.md = md_open(0, 0);

 
            /* fixme: why looking for the signature packet and not 1passpacket*/
            for( n1 = node; (n1 = find_next_kbnode(n1, PKT_SIGNATURE )); ) {
 
            /* fixme: why looking for the signature packet and not 1passpacket*/
            for( n1 = node; (n1 = find_next_kbnode(n1, PKT_SIGNATURE )); ) {

-               gcry_md_enable( c->mfx.md, n1->pkt->pkt.signature->digest_algo);
+               md_enable( c->mfx.md, n1->pkt->pkt.signature->digest_algo);

            }
            /* ask for file and hash it */
            }
            /* ask for file and hash it */

-           if( c->sigs_only )
+           if( c->sigs_only ) {

                rc = hash_datafiles( c->mfx.md, NULL,
                                     c->signed_data, c->sigfilename,
                        n1? (n1->pkt->pkt.onepass_sig->sig_class == 0x01):0 );
                rc = hash_datafiles( c->mfx.md, NULL,
                                     c->signed_data, c->sigfilename,
                        n1? (n1->pkt->pkt.onepass_sig->sig_class == 0x01):0 );

-           else
+           }
+           else {

                rc = ask_for_detached_datafile( c->mfx.md, c->mfx.md2,
                rc = ask_for_detached_datafile( c->mfx.md, c->mfx.md2,

-                                           iobuf_get_fname(c->iobuf), 0 );
+                                               iobuf_get_real_fname(c->iobuf),
+                       n1? (n1->pkt->pkt.onepass_sig->sig_class == 0x01):0 );
+           }

            if( rc ) {
                log_error("can't hash datafile: %s\n", g10_errstr(rc));
                return;
            }
        }
            if( rc ) {
                log_error("can't hash datafile: %s\n", g10_errstr(rc));
                return;
            }
        }

+        else if ( c->signed_data ) {
+            log_error (_("not a detached signature\n") );
+            return;
+        }

 
        for( n1 = node; (n1 = find_next_kbnode(n1, PKT_SIGNATURE )); )
            check_sig_and_print( c, n1 );
     }
 
        for( n1 = node; (n1 = find_next_kbnode(n1, PKT_SIGNATURE )); )
            check_sig_and_print( c, n1 );
     }

+    else if( node->pkt->pkttype == PKT_GPG_CONTROL
+             && node->pkt->pkt.gpg_control->control
+                == CTRLPKT_CLEARSIGN_START ) {
+        /* clear text signed message */
+       if( !c->have_data ) {
+            log_error("cleartext signature without data\n" );
+            return;
+        }
+        else if ( c->signed_data ) {
+            log_error (_("not a detached signature\n") );
+            return;
+        }
+       
+       for( n1 = node; (n1 = find_next_kbnode(n1, PKT_SIGNATURE )); )
+           check_sig_and_print( c, n1 );
+    }

     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;

-
-       if( !c->have_data ) {
+       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"),
+                                                   sig->sig_class);
+       else if( !c->have_data ) {

            /* detached signature */
            free_md_filter_context( &c->mfx );
            /* detached signature */
            free_md_filter_context( &c->mfx );

-           if( !(c->mfx.md = gcry_md_open(sig->digest_algo, 0)) )
-               BUG();
-           if( sig->digest_algo == GCRY_MD_MD5
-               && is_RSA( sig->pubkey_algo ) ) {
+           c->mfx.md = md_open(sig->digest_algo, 0);
+           if( !opt.pgp2_workarounds )
+               ;
+           else if( sig->digest_algo == DIGEST_ALGO_MD5
+                    && is_RSA( sig->pubkey_algo ) ) {

                /* enable a workaround for a pgp2 bug */
                /* enable a workaround for a pgp2 bug */

-               if( !(c->mfx.md2 = gcry_md_open( GCRY_MD_MD5, 0 )) )
-                   BUG();
+               c->mfx.md2 = md_open( DIGEST_ALGO_MD5, 0 );

            }
            }

-           else if( sig->digest_algo == GCRY_MD_SHA1
-                    && sig->pubkey_algo == GCRY_PK_DSA
+           else if( sig->digest_algo == DIGEST_ALGO_SHA1
+                    && sig->pubkey_algo == PUBKEY_ALGO_DSA

                     && sig->sig_class == 0x01 ) {
                /* enable the workaround also for pgp5 when the detached
                 * signature has been created in textmode */
                     && sig->sig_class == 0x01 ) {
                /* enable the workaround also for pgp5 when the detached
                 * signature has been created in textmode */

-               if( !(c->mfx.md2 = gcry_md_open( sig->digest_algo, 0 )) )
-                   BUG();
+               c->mfx.md2 = md_open( sig->digest_algo, 0 );

            }
            }

+#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


@@ -1208,28 +1665,46 @@ proc_tree( CTX c, KBNODE node )
             * then produce the "correct" hash.  This is very, very ugly
             * hack but it may help in some cases (and break others)
             */
             * then produce the "correct" hash.  This is very, very ugly
             * hack but it may help in some cases (and break others)
             */

-           if( c->sigs_only )
+                   /*  c->mfx.md2? 0 :(sig->sig_class == 0x01) */
+#endif
+            if ( DBG_HASHING ) {
+                md_start_debug( c->mfx.md, "verify" );
+                if ( c->mfx.md2  )
+                    md_start_debug( c->mfx.md2, "verify2" );
+            }
+           if( c->sigs_only ) {

                rc = hash_datafiles( c->mfx.md, c->mfx.md2,
                                     c->signed_data, c->sigfilename,
                rc = hash_datafiles( c->mfx.md, c->mfx.md2,
                                     c->signed_data, c->sigfilename,

-                                    c->mfx.md2? 0 :(sig->sig_class == 0x01) );
-           else
+                                    (sig->sig_class == 0x01) );
+           }
+           else {

                rc = ask_for_detached_datafile( c->mfx.md, c->mfx.md2,
                rc = ask_for_detached_datafile( c->mfx.md, c->mfx.md2,

-                                        iobuf_get_fname(c->iobuf),
-                              c->mfx.md2? 0 :(sig->sig_class == 0x01) );
+                                               iobuf_get_real_fname(c->iobuf),
+                                               (sig->sig_class == 0x01) );
+           }

            if( rc ) {
                log_error("can't hash datafile: %s\n", g10_errstr(rc));
                return;
            }
        }
            if( rc ) {
                log_error("can't hash datafile: %s\n", g10_errstr(rc));
                return;
            }
        }

-       else
+        else if ( c->signed_data ) {
+            log_error (_("not a detached signature\n") );
+            return;
+        }
+        else if ( c->pipemode.op == 'B' )
+            ; /* this is a detached signature trough the pipemode handler */
+       else if (!opt.quiet)

            log_info(_("old style (PGP 2.x) signature\n"));
 
            log_info(_("old style (PGP 2.x) signature\n"));
 

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

     }
     }

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

        log_error(_("invalid root packet detected in proc_tree()\n"));
        log_error(_("invalid root packet detected in proc_tree()\n"));

-
+        dump_kbnode (node);
+    }

 }
 }

-
-
-