* options.h, main.h, g10.c (main), import.c (parse_import_options,
[gnupg.git] / g10 / import.c
index 2167f87..40c1e85 100644 (file)
@@ -1,5 +1,5 @@
 /* import.c
- *     Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
 #include "trustdb.h"
 #include "main.h"
 #include "i18n.h"
+#include "status.h"
+#include "keyserver-internal.h"
 
-
-static struct {
+struct stats_s {
+    ulong count;
     ulong no_user_id;
     ulong imported;
     ulong imported_rsa;
@@ -48,15 +50,21 @@ static struct {
     ulong secret_read;
     ulong secret_imported;
     ulong secret_dups;
-} stats;
-
-
-static int import( IOBUF inp, int fast, const char* fname );
-static int read_block( IOBUF a, compress_filter_context_t *cfx,
-                            PACKET **pending_pkt, KBNODE *ret_root );
-static int import_one( const char *fname, KBNODE keyblock, int fast );
-static int import_secret_one( const char *fname, KBNODE keyblock );
-static int import_revoke_cert( const char *fname, KBNODE node );
+    ulong skipped_new_keys;
+};
+
+
+static int import( IOBUF inp, int fast, const char* fname,
+                   struct stats_s *stats );
+static int read_block( IOBUF a, PACKET **pending_pkt, KBNODE *ret_root );
+static void revocation_present(KBNODE keyblock);
+static void remove_bad_stuff (KBNODE keyblock);
+static int import_one( const char *fname, KBNODE keyblock, int fast,
+                       struct stats_s *stats);
+static int import_secret_one( const char *fname, KBNODE keyblock,
+                              struct stats_s *stats );
+static int import_revoke_cert( const char *fname, KBNODE node,
+                               struct stats_s *stats);
 static int chk_self_sigs( const char *fname, KBNODE keyblock,
                          PKT_public_key *pk, u32 *keyid );
 static int delete_inv_parts( const char *fname, KBNODE keyblock, u32 *keyid );
@@ -73,6 +81,60 @@ static int merge_keysigs( KBNODE dst, KBNODE src, int *n_sigs,
                             const char *fname, u32 *keyid );
 
 
+int
+parse_import_options(char *str,unsigned int *options)
+{
+  char *tok;
+  int hit=0;
+  struct
+  {
+    char *name;
+    unsigned int bit;
+  } import_opts[]=
+    {
+      {"allow-local-sigs",IMPORT_ALLOW_LOCAL_SIGS},
+      {NULL,0}
+    };
+
+  while((tok=strsep(&str," ,")))
+    {
+      int i,rev=0;
+
+      if(ascii_memcasecmp("no-",tok,3)==0)
+       rev=1;
+
+      for(i=0;import_opts[i].name;i++)
+       {
+         if(ascii_strcasecmp(import_opts[i].name,tok)==0)
+           {
+             if(rev)
+               *options&=~import_opts[i].bit;
+             else
+               *options|=import_opts[i].bit;
+             hit=1;
+             break;
+           }
+       }
+
+      if(!hit && !import_opts[i].name)
+       return 0;
+    }
+
+  return hit;
+}
+
+void *
+import_new_stats_handle (void)
+{
+    return m_alloc_clear ( sizeof (struct stats_s) );
+}
+
+void
+import_release_stats_handle (void *p)
+{
+    m_free (p);
+}
+
 /****************
  * Import the public keys from the given filename. Input may be armored.
  * This function rejects all keys which are not validly self signed on at
@@ -104,117 +166,168 @@ static int merge_keysigs( KBNODE dst, KBNODE src, int *n_sigs,
  *  Key revocation certificates have special handling.
  *
  */
-int
-import_keys( const char *fname, int fast )
+void
+import_keys( char **fnames, int nnames, int fast, void *stats_handle )
 {
-    IOBUF inp = NULL;
-    int rc;
-
-    inp = iobuf_open(fname);
-    if( !fname )
-       fname = "[stdin]";
-    if( !inp ) {
-       log_error_f(fname, _("can't open file: %s\n"), strerror(errno) );
-       return G10ERR_OPEN_FILE;
+    int i;
+    struct stats_s *stats = stats_handle;
+
+    if (!stats)
+        stats = import_new_stats_handle ();
+
+    if( !fnames && !nnames )
+       nnames = 1;  /* Ohh what a ugly hack to jump into the loop */
+
+    for(i=0; i < nnames; i++ ) {
+       const char *fname = fnames? fnames[i] : NULL;
+       IOBUF inp = iobuf_open(fname);
+       if( !fname )
+           fname = "[stdin]";
+       if( !inp )
+           log_error(_("can't open `%s': %s\n"), fname, strerror(errno) );
+       else {
+           int rc = import( inp, fast, fname, stats );
+           iobuf_close(inp);
+           if( rc )
+               log_error("import from `%s' failed: %s\n", fname,
+                                                          g10_errstr(rc) );
+       }
+       if( !fname )
+           break;
+    }
+    if (!stats_handle) {
+        import_print_stats (stats);
+        import_release_stats_handle (stats);
     }
 
-    rc = import( inp, fast, fname );
-
-    iobuf_close(inp);
-    return rc;
 }
 
 int
-import_keys_stream( IOBUF inp, int fast )
+import_keys_stream( IOBUF inp, int fast, void *stats_handle )
 {
-    return import( inp, fast, "[stream]" );
+    int rc = 0;
+    struct stats_s *stats = stats_handle;
+
+    if (!stats)
+        stats = import_new_stats_handle ();
+
+    rc = import( inp, fast, "[stream]", stats);
+    if (!stats_handle) {
+        import_print_stats (stats);
+        import_release_stats_handle (stats);
+    }
+
+    return rc;
 }
 
 static int
-import( IOBUF inp, int fast, const char* fname )
+import( IOBUF inp, int fast, const char* fname, struct stats_s *stats )
 {
-    armor_filter_context_t afx;
-    compress_filter_context_t cfx;
     PACKET *pending_pkt = NULL;
     KBNODE keyblock;
     int rc = 0;
-    ulong count=0;
-
-    memset( &afx, 0, sizeof afx);
-    memset( &cfx, 0, sizeof cfx);
-    afx.only_keyblocks = 1;
-
-    /* fixme: don't use static variables */
-    memset( &stats, 0, sizeof( stats ) );
-
 
     getkey_disable_caches();
 
-    if( !opt.no_armor ) /* armored reading is not disabled */
-       iobuf_push_filter( inp, armor_filter, &afx );
+    if( !opt.no_armor ) { /* armored reading is not disabled */
+       armor_filter_context_t *afx = m_alloc_clear( sizeof *afx );
+       afx->only_keyblocks = 1;
+       iobuf_push_filter2( inp, armor_filter, afx, 1 );
+    }
 
-    while( !(rc = read_block( inp, &cfx, &pending_pkt, &keyblock) )) {
+    while( !(rc = read_block( inp, &pending_pkt, &keyblock) )) {
+        remove_bad_stuff (keyblock);
        if( keyblock->pkt->pkttype == PKT_PUBLIC_KEY )
-           rc = import_one( fname, keyblock, fast );
-       else if( keyblock->pkt->pkttype == PKT_SECRET_KEY )
-           rc = import_secret_one( fname, keyblock );
+           rc = import_one( fname, keyblock, fast, stats );
+       else if( keyblock->pkt->pkttype == PKT_SECRET_KEY ) 
+                rc = import_secret_one( fname, keyblock, stats );
        else if( keyblock->pkt->pkttype == PKT_SIGNATURE
                 && keyblock->pkt->pkt.signature->sig_class == 0x20 )
-           rc = import_revoke_cert( fname, keyblock );
+           rc = import_revoke_cert( fname, keyblock, stats );
        else {
-           log_info_f(fname, _("skipping block of type %d\n"),
+           log_info( _("skipping block of type %d\n"),
                                            keyblock->pkt->pkttype );
        }
        release_kbnode(keyblock);
        if( rc )
            break;
-       if( !(++count % 100) )
-           log_info(_("%lu keys so far processed\n"), count );
+       if( !(++stats->count % 100) && !opt.quiet )
+           log_info(_("%lu keys so far processed\n"), stats->count );
     }
     if( rc == -1 )
        rc = 0;
     else if( rc && rc != G10ERR_INV_KEYRING )
-       log_error_f( fname, _("read error: %s\n"), g10_errstr(rc));
-
-    log_info(_("Total number processed: %lu\n"), count );
-    if( stats.no_user_id )
-       log_info(_("          w/o user IDs: %lu\n"), stats.no_user_id );
-    if( stats.imported || stats.imported_rsa ) {
-       log_info(_("              imported: %lu"), stats.imported );
-       if( stats.imported_rsa )
-           fprintf(stderr, "  (RSA: %lu)", stats.imported_rsa );
-       putc('\n', stderr);
-    }
-    if( stats.unchanged )
-       log_info(_("             unchanged: %lu\n"), stats.unchanged );
-    if( stats.n_uids )
-       log_info(_("          new user IDs: %lu\n"), stats.n_uids );
-    if( stats.n_subk )
-       log_info(_("           new subkeys: %lu\n"), stats.n_subk );
-    if( stats.n_sigs )
-       log_info(_("        new signatures: %lu\n"), stats.n_sigs );
-    if( stats.n_revoc )
-       log_info(_("   new key revocations: %lu\n"), stats.n_revoc );
-    if( stats.secret_read )
-       log_info(_("      secret keys read: %lu\n"), stats.secret_read );
-    if( stats.secret_imported )
-       log_info(_("  secret keys imported: %lu\n"), stats.secret_imported );
-    if( stats.secret_dups )
-       log_info(_(" secret keys unchanged: %lu\n"), stats.secret_dups );
+       log_error( _("error reading `%s': %s\n"), fname, g10_errstr(rc));
 
     return rc;
 }
 
 
+void
+import_print_stats (void *hd)
+{
+    struct stats_s *stats = hd;
+
+    if( !opt.quiet ) {
+       log_info(_("Total number processed: %lu\n"), stats->count );
+       if( stats->skipped_new_keys )
+           log_info(_("      skipped new keys: %lu\n"),
+                                               stats->skipped_new_keys );
+       if( stats->no_user_id )
+           log_info(_("          w/o user IDs: %lu\n"), stats->no_user_id );
+       if( stats->imported || stats->imported_rsa ) {
+           log_info(_("              imported: %lu"), stats->imported );
+           if( stats->imported_rsa )
+               fprintf(stderr, "  (RSA: %lu)", stats->imported_rsa );
+           putc('\n', stderr);
+       }
+       if( stats->unchanged )
+           log_info(_("             unchanged: %lu\n"), stats->unchanged );
+       if( stats->n_uids )
+           log_info(_("          new user IDs: %lu\n"), stats->n_uids );
+       if( stats->n_subk )
+           log_info(_("           new subkeys: %lu\n"), stats->n_subk );
+       if( stats->n_sigs )
+           log_info(_("        new signatures: %lu\n"), stats->n_sigs );
+       if( stats->n_revoc )
+           log_info(_("   new key revocations: %lu\n"), stats->n_revoc );
+       if( stats->secret_read )
+           log_info(_("      secret keys read: %lu\n"), stats->secret_read );
+       if( stats->secret_imported )
+           log_info(_("  secret keys imported: %lu\n"), stats->secret_imported );
+       if( stats->secret_dups )
+           log_info(_(" secret keys unchanged: %lu\n"), stats->secret_dups );
+    }
+
+    if( is_status_enabled() ) {
+       char buf[13*20];
+       sprintf(buf, "%lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu",
+               stats->count,
+               stats->no_user_id,
+               stats->imported,
+               stats->imported_rsa,
+               stats->unchanged,
+               stats->n_uids,
+               stats->n_subk,
+               stats->n_sigs,
+               stats->n_revoc,
+               stats->secret_read,
+               stats->secret_imported,
+               stats->secret_dups,
+               stats->skipped_new_keys );
+       write_status_text( STATUS_IMPORT_RES, buf );
+    }
+}
+
+
 /****************
- * Read the next keyblock from stream A, CFX is used to handle
- * compressed keyblocks. PENDING_PKT should be initialzed to NULL
+ * Read the next keyblock from stream A.
+ * PENDING_PKT should be initialzed to NULL
  * and not chnaged form the caller.
  * Retunr: 0 = okay, -1 no more blocks or another errorcode.
  */
 static int
-read_block( IOBUF a, compress_filter_context_t *cfx,
-           PACKET **pending_pkt, KBNODE *ret_root )
+read_block( IOBUF a, PACKET **pending_pkt, KBNODE *ret_root )
 {
     int rc;
     PACKET *pkt;
@@ -259,13 +372,21 @@ read_block( IOBUF a, compress_filter_context_t *cfx,
                rc = G10ERR_COMPR_ALGO;
                goto ready;
            }
-           cfx->algo = pkt->pkt.compressed->algorithm;
-           pkt->pkt.compressed->buf = NULL;
-           iobuf_push_filter( a, compress_filter, cfx );
+           {
+               compress_filter_context_t *cfx = m_alloc_clear( sizeof *cfx );
+               cfx->algo = pkt->pkt.compressed->algorithm;
+               pkt->pkt.compressed->buf = NULL;
+               iobuf_push_filter2( a, compress_filter, cfx, 1 );
+           }
            free_packet( pkt );
            init_packet(pkt);
            break;
 
+          case PKT_RING_TRUST:
+            /* skip those packets */
+           free_packet( pkt );
+           init_packet(pkt);
+            break;
 
          case PKT_PUBLIC_KEY:
          case PKT_SECRET_KEY:
@@ -301,6 +422,111 @@ read_block( IOBUF a, compress_filter_context_t *cfx,
 }
 
 
+static void
+remove_bad_stuff (KBNODE keyblock)
+{
+    KBNODE node;
+
+    for (node=keyblock; node; node = node->next ) {
+        if( node->pkt->pkttype == PKT_SIGNATURE ) {
+            /* delete the subpackets we used to use for the
+               verification cache */
+            delete_sig_subpkt (node->pkt->pkt.signature->unhashed,
+                               SIGSUBPKT_PRIV_VERIFY_CACHE);
+        }
+    }
+}
+
+/* Clean the subkeys on a pk so that they each have at most 1 binding
+   sig and at most 1 revocation sig.  This works based solely on the
+   timestamps like the rest of gpg.  If the standard does get
+   revocation targets, this may need to be revised. */
+
+static int
+clean_subkeys(KBNODE keyblock,u32 *keyid)
+{
+  int removed=0;
+  KBNODE node,sknode=keyblock;
+
+  while((sknode=find_kbnode(sknode,PKT_PUBLIC_SUBKEY)))
+    {
+      KBNODE bsnode=NULL,rsnode=NULL;
+      u32 bsdate=0,rsdate=0;
+
+      sknode=sknode->next;
+
+      for(node=sknode;node;node=node->next)
+       {
+         if(node->pkt->pkttype==PKT_SIGNATURE)
+           {
+             PKT_signature *sig=node->pkt->pkt.signature;
+
+             /* We're only interested in valid sigs */
+             if(check_key_signature(keyblock,node,NULL))
+               continue;
+
+             if(IS_SUBKEY_SIG(sig) && bsdate<=sig->timestamp)
+               {
+                 bsnode=node;
+                 bsdate=sig->timestamp;
+               }
+             else if(IS_SUBKEY_REV(sig) && rsdate<=sig->timestamp)
+               {
+                 rsnode=node;
+                 rsdate=sig->timestamp;
+               }
+             /* If it's not a subkey sig or rev, then it shouldn't be
+                 here so ignore it. */
+           }
+         else
+           break;
+       }
+
+      /* We now know the most recent binding sig and revocation sig
+         (if any).  If the binding sig is more recent than the
+         revocation sig, strip everything but the binding sig.  If the
+         revocation sig is more recent than the binding sig, strip
+         everything but the binding sig and the revocation sig. */
+
+      if(bsdate>=rsdate)
+       {
+         rsnode=NULL;
+         rsdate=0;
+       }
+
+     for(node=sknode;node;node=node->next)
+       {
+         if(node->pkt->pkttype==PKT_SIGNATURE)
+           {
+             PKT_signature *sig=node->pkt->pkt.signature;
+
+             if(IS_SUBKEY_SIG(sig) && node!=bsnode)
+               {
+                 delete_kbnode(node);
+                 removed++;
+               }
+             else if(IS_SUBKEY_REV(sig) && node!=rsnode)
+               {
+                 delete_kbnode(node);
+                 removed++;
+               }
+           }
+         else
+           break;
+       }
+    }
+
+  if(removed)
+    {
+      log_info(_("key %08lX: removed multiple subkey binding\n"),
+              (ulong)keyid[1]);
+      commit_kbnode(&keyblock);
+    }
+
+  return removed;
+}
+
+
 /****************
  * Try to import one keyblock. Return an error only in serious cases, but
  * never for an invalid keyblock.  It uses log_error to increase the
@@ -308,13 +534,13 @@ read_block( IOBUF a, compress_filter_context_t *cfx,
  * which called g10.
  */
 static int
-import_one( const char *fname, KBNODE keyblock, int fast )
+import_one( const char *fname, KBNODE keyblock, int fast,
+            struct stats_s *stats )
 {
     PKT_public_key *pk;
     PKT_public_key *pk_orig;
     KBNODE node, uidnode;
     KBNODE keyblock_orig = NULL;
-    KBPOS kbpos;
     u32 keyid[2];
     int rc = 0;
     int new_key = 0;
@@ -330,17 +556,17 @@ import_one( const char *fname, KBNODE keyblock, int fast )
     uidnode = find_next_kbnode( keyblock, PKT_USER_ID );
 
     if( opt.verbose ) {
-       log_info_f( fname, "pub  %4u%c/%08lX %s   ",
+       log_info( "pub  %4u%c/%08lX %s   ",
                  nbits_from_pk( pk ),
                  pubkey_letter( pk->pubkey_algo ),
                  (ulong)keyid[1], datestr_from_pk(pk) );
        if( uidnode )
-           print_string( stderr, uidnode->pkt->pkt.user_id->name,
-                                 uidnode->pkt->pkt.user_id->len, 0 );
+           print_utf8_string( stderr, uidnode->pkt->pkt.user_id->name,
+                                      uidnode->pkt->pkt.user_id->len );
        putc('\n', stderr);
     }
     if( !uidnode ) {
-       log_error_f(fname, _("key %08lX: no user id\n"), (ulong)keyid[1]);
+       log_error( _("key %08lX: no user ID\n"), (ulong)keyid[1]);
        return 0;
     }
 
@@ -349,165 +575,201 @@ import_one( const char *fname, KBNODE keyblock, int fast )
     if( rc )
        return rc== -1? 0:rc;
 
+    /* If we allow such a thing, mark unsigned uids as valid */
+    if( opt.allow_non_selfsigned_uid )
+      for( node=keyblock; node; node = node->next )
+       if( node->pkt->pkttype == PKT_USER_ID && !(node->flag & 1) )
+         {
+           char *user=utf8_to_native(node->pkt->pkt.user_id->name,
+                                     node->pkt->pkt.user_id->len,0);
+           node->flag |= 1;
+           log_info( _("key %08lX: accepted non self-signed user ID '%s'\n"),
+                     (ulong)keyid[1],user);
+           m_free(user);
+         }
+
     if( !delete_inv_parts( fname, keyblock, keyid ) ) {
        if( !opt.quiet ) {
-           log_info_f( fname, _("key %08lX: no valid user ids\n"),
+           log_info( _("key %08lX: no valid user IDs\n"),
                                                        (ulong)keyid[1]);
            log_info(_("this may be caused by a missing self-signature\n"));
        }
-       stats.no_user_id++;
+       stats->no_user_id++;
        return 0;
     }
 
-
     /* do we have this key already in one of our pubrings ? */
     pk_orig = m_alloc_clear( sizeof *pk_orig );
     rc = get_pubkey( pk_orig, keyid );
-    if( rc && rc != G10ERR_NO_PUBKEY ) {
-       log_error_f( fname, _("key %08lX: public key not found: %s\n"),
+    if( rc && rc != G10ERR_NO_PUBKEY && rc != G10ERR_UNU_PUBKEY ) {
+       log_error( _("key %08lX: public key not found: %s\n"),
                                (ulong)keyid[1], g10_errstr(rc));
     }
+    else if ( rc && opt.merge_only ) {
+       if( opt.verbose )
+           log_info( _("key %08lX: new key - skipped\n"), (ulong)keyid[1] );
+       rc = 0;
+       fast = 1; /* so that we don't get into the trustdb update */
+       stats->skipped_new_keys++;
+    }
     else if( rc ) { /* insert this key */
-       /* get default resource */
-       if( get_keyblock_handle( NULL, 0, &kbpos ) ) {
-           log_error(_("no default public keyring\n"));
+        KEYDB_HANDLE hd = keydb_new (0);
+
+        rc = keydb_locate_writable (hd, NULL);
+       if (rc) {
+           log_error (_("no writable keyring found: %s\n"), g10_errstr (rc));
+            keydb_release (hd);
            return G10ERR_GENERAL;
        }
        if( opt.verbose > 1 )
-           log_info_f( fname, _("writing to `%s'\n"),
-                               keyblock_resource_name(&kbpos) );
-       if( (rc=lock_keyblock( &kbpos )) )
-           log_error_f( keyblock_resource_name(&kbpos),
-                       _("can't lock public keyring: %s\n"), g10_errstr(rc) );
-       else if( (rc=insert_keyblock( &kbpos, keyblock )) )
-           log_error_f( keyblock_resource_name(&kbpos),
-                       _("can't write to keyring: %s\n"), g10_errstr(rc) );
-       unlock_keyblock( &kbpos );
+           log_info (_("writing to `%s'\n"), keydb_get_resource_name (hd) );
+       clean_subkeys(keyblock,keyid);
+       rc = keydb_insert_keyblock (hd, keyblock );
+        if (rc)
+          log_error (_("error writing keyring `%s': %s\n"),
+                      keydb_get_resource_name (hd), g10_errstr(rc));
+       else
+          revalidation_mark ();
+        keydb_release (hd);
+
        /* we are ready */
-       if( !opt.quiet )
-           log_info_f( fname, _("key %08lX: public key imported\n"),
-                                                     (ulong)keyid[1]);
-       stats.imported++;
+       if( !opt.quiet ) {
+           char *p=get_user_id_native(keyid);
+           log_info( _("key %08lX: public key \"%s\" imported\n"),
+                     (ulong)keyid[1],p);
+           m_free(p);
+       }
+       if( is_status_enabled() ) {
+           char *us = get_long_user_id_string( keyid );
+           write_status_text( STATUS_IMPORTED, us );
+           m_free(us);
+       }
+       stats->imported++;
        if( is_RSA( pk->pubkey_algo ) )
-           stats.imported_rsa++;
+           stats->imported_rsa++;
        new_key = 1;
     }
     else { /* merge */
+        KEYDB_HANDLE hd;
        int n_uids, n_sigs, n_subk;
 
        /* Compare the original against the new key; just to be sure nothing
         * weird is going on */
        if( cmp_public_keys( pk_orig, pk ) ) {
-           log_error_f( fname, _("key %08lX: doesn't match our copy\n"),
+           log_error( _("key %08lX: doesn't match our copy\n"),
                                                          (ulong)keyid[1]);
-           rc = G10ERR_GENERAL;
            goto leave;
        }
 
-       /* See whether we have only non-self-signature on one user id; if not
-        * ask the user what to do. <--- fixme */
-
        /* now read the original keyblock */
-       rc = find_keyblock_bypk( &kbpos, pk_orig );
+        hd = keydb_new (0);
+        {
+            byte afp[MAX_FINGERPRINT_LEN];
+            size_t an;
+
+            fingerprint_from_pk (pk_orig, afp, &an);
+            while (an < MAX_FINGERPRINT_LEN) 
+                afp[an++] = 0;
+            rc = keydb_search_fpr (hd, afp);
+        }
        if( rc ) {
-           log_error_f(fname,
-                       _("key %08lX: can't locate original keyblock: %s\n"),
+           log_error (_("key %08lX: can't locate original keyblock: %s\n"),
                                     (ulong)keyid[1], g10_errstr(rc));
+            keydb_release (hd);
            goto leave;
        }
-       rc = read_keyblock( &kbpos, &keyblock_orig );
-       if( rc ) {
-           log_error_f(fname,
-                       _("key %08lX: can't read original keyblock: %s\n"),
+       rc = keydb_get_keyblock (hd, &keyblock_orig );
+       if (rc) {
+           log_error (_("key %08lX: can't read original keyblock: %s\n"),
                                            (ulong)keyid[1], g10_errstr(rc));
+            keydb_release (hd);
            goto leave;
        }
+
+       collapse_uids( &keyblock );
        /* and try to merge the block */
        clear_kbnode_flags( keyblock_orig );
        clear_kbnode_flags( keyblock );
        n_uids = n_sigs = n_subk = 0;
        rc = merge_blocks( fname, keyblock_orig, keyblock,
                                keyid, &n_uids, &n_sigs, &n_subk );
-       if( rc )
+       if( rc ) {
+            keydb_release (hd);
            goto leave;
+        }
        if( n_uids || n_sigs || n_subk ) {
            mod_key = 1;
            /* keyblock_orig has been updated; write */
-           if( opt.verbose > 1 )
-               log_info_f(keyblock_resource_name(&kbpos),
-                                     _("writing keyblock\n"));
-           if( (rc=lock_keyblock( &kbpos )) )
-               log_error_f(keyblock_resource_name(&kbpos),
-                        _("can't lock public keyring: %s\n"), g10_errstr(rc) );
-           else if( (rc=update_keyblock( &kbpos, keyblock_orig )) )
-               log_error_f( keyblock_resource_name(&kbpos),
-                           _("can't write keyblock: %s\n"), g10_errstr(rc) );
-           unlock_keyblock( &kbpos );
+           n_sigs-=clean_subkeys(keyblock_orig,keyid);
+           rc = keydb_update_keyblock (hd, keyblock_orig);
+            if (rc)
+               log_error (_("error writing keyring `%s': %s\n"),
+                            keydb_get_resource_name (hd), g10_errstr(rc) );
+           else
+             revalidation_mark ();
+
            /* we are ready */
            if( !opt.quiet ) {
+               char *p=get_user_id_native(keyid);
                if( n_uids == 1 )
-                   log_info_f(fname, _("key %08lX: 1 new user-id\n"),
-                                            (ulong)keyid[1]);
+                   log_info( _("key %08lX: \"%s\" 1 new user ID\n"),
+                                            (ulong)keyid[1], p);
                else if( n_uids )
-                   log_info_f(fname, _("key %08lX: %d new user-ids\n"),
-                                            (ulong)keyid[1], n_uids );
+                   log_info( _("key %08lX: \"%s\" %d new user IDs\n"),
+                                            (ulong)keyid[1], p, n_uids );
                if( n_sigs == 1 )
-                   log_info_f(fname, _("key %08lX: 1 new signature\n"),
-                                            (ulong)keyid[1]);
+                   log_info( _("key %08lX: \"%s\" 1 new signature\n"),
+                                            (ulong)keyid[1], p);
                else if( n_sigs )
-                   log_info_f(fname, _("key %08lX: %d new signatures\n"),
-                                            (ulong)keyid[1], n_sigs );
+                   log_info( _("key %08lX: \"%s\" %d new signatures\n"),
+                                            (ulong)keyid[1], p, n_sigs );
                if( n_subk == 1 )
-                   log_info_f(fname, _("key %08lX: 1 new subkey\n"),
-                                            (ulong)keyid[1]);
+                   log_info( _("key %08lX: \"%s\" 1 new subkey\n"),
+                                            (ulong)keyid[1], p);
                else if( n_subk )
-                   log_info_f(fname, _("key %08lX: %d new subkeys\n"),
-                                            (ulong)keyid[1], n_subk );
+                   log_info( _("key %08lX: \"%s\" %d new subkeys\n"),
+                                            (ulong)keyid[1], p, n_subk );
+               m_free(p);
            }
 
-           stats.n_uids +=n_uids;
-           stats.n_sigs +=n_sigs;
-           stats.n_subk +=n_subk;
+           stats->n_uids +=n_uids;
+           stats->n_sigs +=n_sigs;
+           stats->n_subk +=n_subk;
        }
        else {
-           if( !opt.quiet )
-               log_info_f(fname, _("key %08lX: not changed\n"),
-                                                   (ulong)keyid[1] );
-           stats.unchanged++;
-       }
-    }
-    if( !rc && !fast ) {
-       rc = query_trust_record( new_key? pk : pk_orig );
-       if( rc && rc != -1 )
-           log_error("trustdb error: %s\n", g10_errstr(rc) );
-       else if( rc == -1 ) { /* not found trustdb */
-           rc = insert_trust_record( new_key? pk : pk_orig );
-           if( rc )
-               log_error("key %08lX: trustdb insert failed: %s\n",
-                                       (ulong)keyid[1], g10_errstr(rc) );
+           if( !opt.quiet ) {
+               char *p=get_user_id_native(keyid);
+               log_info( _("key %08lX: \"%s\" not changed\n"),
+                         (ulong)keyid[1],p);
+               m_free(p);
+           }
+           stats->unchanged++;
        }
-       else if( mod_key )
-           rc = update_trust_record( keyblock_orig, 1, NULL );
-       else
-           rc = clear_trust_checked_flag( new_key? pk : pk_orig );
+        keydb_release (hd); hd = NULL;
     }
 
   leave:
     release_kbnode( keyblock_orig );
     free_public_key( pk_orig );
+
+    revocation_present(keyblock);
+
     return rc;
 }
 
 
 /****************
  * Ditto for secret keys.  Handling is simpler than for public keys.
+ * We allow secret key importing only when allow is true, this is so
+ * that a secret key can not be imported accidently and thereby tampering
+ * with the trust calculation.
  */
 static int
-import_secret_one( const char *fname, KBNODE keyblock )
+import_secret_one( const char *fname, KBNODE keyblock, 
+                   struct stats_s *stats)
 {
     PKT_secret_key *sk;
     KBNODE node, uidnode;
-    KBPOS kbpos;
     u32 keyid[2];
     int rc = 0;
 
@@ -521,18 +783,19 @@ import_secret_one( const char *fname, KBNODE keyblock )
     uidnode = find_next_kbnode( keyblock, PKT_USER_ID );
 
     if( opt.verbose ) {
-       log_info_f(fname, "sec  %4u%c/%08lX %s   ",
+       log_info( "sec  %4u%c/%08lX %s   ",
                  nbits_from_sk( sk ),
                  pubkey_letter( sk->pubkey_algo ),
                  (ulong)keyid[1], datestr_from_sk(sk) );
        if( uidnode )
-           print_string( stderr, uidnode->pkt->pkt.user_id->name,
-                                 uidnode->pkt->pkt.user_id->len, 0 );
+           print_utf8_string( stderr, uidnode->pkt->pkt.user_id->name,
+                                      uidnode->pkt->pkt.user_id->len );
        putc('\n', stderr);
     }
-    stats.secret_read++;
+    stats->secret_read++;
+
     if( !uidnode ) {
-       log_error_f(fname, _("key %08lX: no user id\n"), (ulong)keyid[1]);
+       log_error( _("key %08lX: no user ID\n"), (ulong)keyid[1]);
        return 0;
     }
 
@@ -540,32 +803,33 @@ import_secret_one( const char *fname, KBNODE keyblock )
 
     /* do we have this key already in one of our secrings ? */
     rc = seckey_available( keyid );
-    if( rc == G10ERR_NO_SECKEY ) { /* simply insert this key */
+    if( rc == G10ERR_NO_SECKEY && !opt.merge_only ) { /* simply insert this key */
+        KEYDB_HANDLE hd = keydb_new (1);
+
        /* get default resource */
-       if( get_keyblock_handle( NULL, 1, &kbpos ) ) {
-           log_error("no default secret keyring\n");
+        rc = keydb_locate_writable (hd, NULL);
+       if (rc) {
+           log_error (_("no default secret keyring: %s\n"), g10_errstr (rc));
+            keydb_release (hd);
            return G10ERR_GENERAL;
        }
-       if( opt.verbose > 1 )
-           log_info_f(keyblock_resource_name(&kbpos), _("writing keyblock\n"));
-       if( (rc=lock_keyblock( &kbpos )) )
-           log_error_f( keyblock_resource_name(&kbpos),
-                     _("can't lock secret keyring: %s\n"), g10_errstr(rc) );
-       else if( (rc=insert_keyblock( &kbpos, keyblock )) )
-           log_error_f(keyblock_resource_name(&kbpos),
-                     _("can't write keyring: %s\n"), g10_errstr(rc) );
-       unlock_keyblock( &kbpos );
+       rc = keydb_insert_keyblock (hd, keyblock );
+        if (rc)
+           log_error (_("error writing keyring `%s': %s\n"),
+                       keydb_get_resource_name (hd), g10_errstr(rc) );
+        keydb_release (hd);
        /* we are ready */
-       log_info_f(fname, _("key %08lX: secret key imported\n"), (ulong)keyid[1]);
-       stats.secret_imported++;
+       if( !opt.quiet )
+           log_info( _("key %08lX: secret key imported\n"), (ulong)keyid[1]);
+       stats->secret_imported++;
     }
     else if( !rc ) { /* we can't merge secret keys */
-       log_error_f(fname, _("key %08lX: already in secret keyring\n"),
-                                               (ulong)keyid[1]);
-       stats.secret_dups++;
+       log_error( _("key %08lX: already in secret keyring\n"),
+                                                       (ulong)keyid[1]);
+       stats->secret_dups++;
     }
     else
-       log_error_f(fname, _("key %08lX: secret key not found: %s\n"),
+       log_error( _("key %08lX: secret key not found: %s\n"),
                                (ulong)keyid[1], g10_errstr(rc));
 
     return rc;
@@ -576,11 +840,11 @@ import_secret_one( const char *fname, KBNODE keyblock )
  * Import a revocation certificate; this is a single signature packet.
  */
 static int
-import_revoke_cert( const char *fname, KBNODE node )
+import_revoke_cert( const char *fname, KBNODE node, struct stats_s *stats )
 {
     PKT_public_key *pk=NULL;
     KBNODE onode, keyblock = NULL;
-    KBPOS kbpos;
+    KEYDB_HANDLE hd = NULL;
     u32 keyid[2];
     int rc = 0;
 
@@ -594,30 +858,37 @@ import_revoke_cert( const char *fname, KBNODE node )
     pk = m_alloc_clear( sizeof *pk );
     rc = get_pubkey( pk, keyid );
     if( rc == G10ERR_NO_PUBKEY ) {
-       log_info_f(fname, _("key %08lX: no public key - "
+       log_info( _("key %08lX: no public key - "
                 "can't apply revocation certificate\n"), (ulong)keyid[1]);
        rc = 0;
        goto leave;
     }
     else if( rc ) {
-       log_error_f(fname, _("key %08lX: public key not found: %s\n"),
+       log_error( _("key %08lX: public key not found: %s\n"),
                                       (ulong)keyid[1], g10_errstr(rc));
        goto leave;
     }
 
     /* read the original keyblock */
-    rc = find_keyblock_bypk( &kbpos, pk );
-    if( rc ) {
-       log_error_f(fname,
-               _("key %08lX: can't locate original keyblock: %s\n"),
-                                       (ulong)keyid[1], g10_errstr(rc));
+    hd = keydb_new (0);
+    {
+        byte afp[MAX_FINGERPRINT_LEN];
+        size_t an;
+        
+        fingerprint_from_pk (pk, afp, &an);
+        while (an < MAX_FINGERPRINT_LEN) 
+            afp[an++] = 0;
+        rc = keydb_search_fpr (hd, afp);
+    }
+    if (rc) {
+       log_error (_("key %08lX: can't locate original keyblock: %s\n"),
+                   (ulong)keyid[1], g10_errstr(rc));
        goto leave;
     }
-    rc = read_keyblock( &kbpos, &keyblock );
-    if( rc ) {
-       log_error_f(fname,
-               _("key %08lX: can't read original keyblock: %s\n"),
-                                       (ulong)keyid[1], g10_errstr(rc));
+    rc = keydb_get_keyblock (hd, &keyblock );
+    if (rc) {
+       log_error (_("key %08lX: can't read original keyblock: %s\n"),
+                   (ulong)keyid[1], g10_errstr(rc));
        goto leave;
     }
 
@@ -627,8 +898,9 @@ import_revoke_cert( const char *fname, KBNODE node )
      * special case. */
     rc = check_key_signature( keyblock, node, NULL);
     if( rc ) {
-       log_error_f(fname, _("key %08lX: invalid revocation certificate"
+       log_error( _("key %08lX: invalid revocation certificate"
                  ": %s - rejected\n"), (ulong)keyid[1], g10_errstr(rc));
+       goto leave;
     }
 
 
@@ -650,22 +922,23 @@ import_revoke_cert( const char *fname, KBNODE node )
     insert_kbnode( keyblock, clone_kbnode(node), 0 );
 
     /* and write the keyblock back */
-    if( opt.verbose > 1 )
-       log_info_f( keyblock_resource_name(&kbpos), _("writing keyblock\n"));
-    if( (rc=lock_keyblock( &kbpos )) )
-       log_error_f( keyblock_resource_name(&kbpos),
-                   _("can't lock public keyring: %s\n"), g10_errstr(rc) );
-    else if( (rc=update_keyblock( &kbpos, keyblock )) )
-       log_error_f(keyblock_resource_name(&kbpos),
-                   _("can't write keyblock: %s\n"), g10_errstr(rc) );
-    unlock_keyblock( &kbpos );
+    rc = keydb_update_keyblock (hd, keyblock );
+    if (rc)
+       log_error (_("error writing keyring `%s': %s\n"),
+                   keydb_get_resource_name (hd), g10_errstr(rc) );
+    keydb_release (hd); hd = NULL;
     /* we are ready */
-    if( !opt.quiet )
-       log_info_f(fname, _("key %08lX: revocation certificate imported\n"),
-                                       (ulong)keyid[1]);
-    stats.n_revoc++;
+    if( !opt.quiet ) {
+        char *p=get_user_id_native(keyid);
+       log_info( _("key %08lX: \"%s\" revocation certificate imported\n"),
+                                       (ulong)keyid[1],p);
+       m_free(p);
+    }
+    stats->n_revoc++;
+    revalidation_mark ();
 
   leave:
+    keydb_release (hd);
     release_kbnode( keyblock );
     free_public_key( pk );
     return rc;
@@ -676,7 +949,7 @@ import_revoke_cert( const char *fname, KBNODE node )
  * loop over the keyblock and check all self signatures.
  * Mark all user-ids with a self-signature by setting flag bit 0.
  * Mark all user-ids with an invalid self-signature by setting bit 1.
- * This works allso for subkeys, here the subkey is marked.
+ * This works also for subkeys, here the subkey is marked.
  */
 static int
 chk_self_sigs( const char *fname, KBNODE keyblock,
@@ -694,21 +967,29 @@ chk_self_sigs( const char *fname, KBNODE keyblock,
            if( (sig->sig_class&~3) == 0x10 ) {
                KBNODE unode = find_prev_kbnode( keyblock, n, PKT_USER_ID );
                if( !unode )  {
-                   log_error_f(fname,
-                               _("key %08lX: no user-id for signature\n"),
+                   log_error( _("key %08lX: no user ID for signature\n"),
                                            (ulong)keyid[1]);
                    return -1;  /* the complete keyblock is invalid */
                }
-               rc = check_key_signature( keyblock, n, NULL);
-               if( rc ) {
-                   log_error_f( fname,  rc == G10ERR_PUBKEY_ALGO ?
-                        _("key %08lX: unsupported public key algorithm\n"):
-                        _("key %08lX: invalid self-signature\n"),
-                                    (ulong)keyid[1]);
 
-                   unode->flag |= 2; /* mark as invalid */
+               /* If it hasn't been marked valid yet, keep trying */
+               if(!(unode->flag&1)) {
+                 rc = check_key_signature( keyblock, n, NULL);
+                 if( rc )
+                   {
+                     char *p=utf8_to_native(unode->pkt->pkt.user_id->name,
+                                     strlen(unode->pkt->pkt.user_id->name),0);
+                     log_info( rc == G10ERR_PUBKEY_ALGO ?
+                               _("key %08lX: unsupported public key "
+                                 "algorithm on user id \"%s\"\n"):
+                               _("key %08lX: invalid self-signature "
+                                 "on user id \"%s\"\n"),
+                               (ulong)keyid[1],p);
+                     m_free(p);
+                   }
+                 else
+                   unode->flag |= 1; /* mark that signature checked */
                }
-               unode->flag |= 1; /* mark that signature checked */
            }
            else if( sig->sig_class == 0x18 ) {
                KBNODE knode = find_prev_kbnode( keyblock,
@@ -717,23 +998,24 @@ chk_self_sigs( const char *fname, KBNODE keyblock,
                    knode = find_prev_kbnode( keyblock,
                                                 n, PKT_SECRET_SUBKEY );
 
-               if( !knode )  {
-                   log_error_f(fname,
-                             _("key %08lX: no subkey for key binding\n"),
+               if( !knode ) {
+                   log_info( _("key %08lX: no subkey for key binding\n"),
                                            (ulong)keyid[1]);
+                   n->flag |= 4; /* delete this */
                }
                else {
+                 /* If it hasn't been marked valid yet, keep trying */
+                 if(!(knode->flag&1)) {
                    rc = check_key_signature( keyblock, n, NULL);
-                   if( rc ) {
-                       log_error_f( fname,  rc == G10ERR_PUBKEY_ALGO ?
+                   if( rc )
+                       log_info(  rc == G10ERR_PUBKEY_ALGO ?
                           _("key %08lX: unsupported public key algorithm\n"):
                           _("key %08lX: invalid subkey binding\n"),
                                         (ulong)keyid[1]);
-
-                       knode->flag |= 2; /* mark as invalid */
-                   }
+                   else
+                     knode->flag |= 1; /* mark that signature checked */
+                 }
                }
-               knode->flag |= 1; /* mark that signature checked */
            }
        }
     }
@@ -758,15 +1040,18 @@ delete_inv_parts( const char *fname, KBNODE keyblock, u32 *keyid )
            uid_seen = 1;
            if( (node->flag & 2) || !(node->flag & 1) ) {
                if( opt.verbose ) {
-                   log_info_f(fname, _("key %08lX: skipped userid '"),
+                   log_info( _("key %08lX: skipped user ID '"),
                                                         (ulong)keyid[1]);
-                   print_string( stderr, node->pkt->pkt.user_id->name,
-                                     node->pkt->pkt.user_id->len, 0 );
+                   print_utf8_string( stderr, node->pkt->pkt.user_id->name,
+                                      node->pkt->pkt.user_id->len );
                    fputs("'\n", stderr );
                }
                delete_kbnode( node ); /* the user-id */
                /* and all following packets up to the next user-id */
-               while( node->next && node->next->pkt->pkttype != PKT_USER_ID ){
+               while( node->next
+                      && node->next->pkt->pkttype != PKT_USER_ID
+                      && node->next->pkt->pkttype != PKT_PUBLIC_SUBKEY
+                      && node->next->pkt->pkttype != PKT_SECRET_SUBKEY ){
                    delete_kbnode( node->next );
                    node = node->next;
                }
@@ -778,7 +1063,7 @@ delete_inv_parts( const char *fname, KBNODE keyblock, u32 *keyid )
                 || node->pkt->pkttype == PKT_SECRET_SUBKEY ) {
            if( (node->flag & 2) || !(node->flag & 1) ) {
                if( opt.verbose ) {
-                   log_info_f(fname, _("key %08lX: skipped subkey\n"),
+                   log_info( _("key %08lX: skipped subkey\n"),
                                                         (ulong)keyid[1]);
                }
                delete_kbnode( node ); /* the subkey */
@@ -794,24 +1079,50 @@ delete_inv_parts( const char *fname, KBNODE keyblock, u32 *keyid )
                 && check_pubkey_algo( node->pkt->pkt.signature->pubkey_algo)
                 && node->pkt->pkt.signature->pubkey_algo != PUBKEY_ALGO_RSA )
            delete_kbnode( node ); /* build_packet() can't handle this */
+       else if( node->pkt->pkttype == PKT_SIGNATURE &&
+                !node->pkt->pkt.signature->flags.exportable &&
+                !(opt.import_options&IMPORT_ALLOW_LOCAL_SIGS) &&
+                seckey_available( node->pkt->pkt.signature->keyid ) ) {
+           /* here we violate the rfc a bit by still allowing
+            * to import non-exportable signature when we have the
+            * the secret key used to create this signature - it
+            * seems that this makes sense */
+           log_info( _("key %08lX: non exportable signature "
+                                   "(class %02x) - skipped\n"),
+                                   (ulong)keyid[1],
+                                    node->pkt->pkt.signature->sig_class );
+           delete_kbnode( node );
+       }
        else if( node->pkt->pkttype == PKT_SIGNATURE
                 && node->pkt->pkt.signature->sig_class == 0x20 )  {
            if( uid_seen ) {
-               log_error_f(fname, _("key %08lX: revocation certificate "
+               log_error( _("key %08lX: revocation certificate "
                                     "at wrong place - skipped\n"),
                                    (ulong)keyid[1]);
                delete_kbnode( node );
            }
            else {
-               int rc = check_key_signature( keyblock, node, NULL);
-               if( rc ) {
-                   log_error_f(fname, _("key %08lX: invalid revocation "
-                             "certificate: %s - skipped\n"),
-                             (ulong)keyid[1], g10_errstr(rc));
-                   delete_kbnode( node );
+             /* If the revocation cert is from a different key than
+                 the one we're working on don't check it - it's
+                 probably from a revocation key and won't be
+                 verifiable with this key anyway. */
+
+             if(node->pkt->pkt.signature->keyid[0]==keyid[0] &&
+                node->pkt->pkt.signature->keyid[1]==keyid[1])
+               {
+                 int rc = check_key_signature( keyblock, node, NULL);
+                 if( rc )
+                   {
+                     log_error( _("key %08lX: invalid revocation "
+                                  "certificate: %s - skipped\n"),
+                                (ulong)keyid[1], g10_errstr(rc));
+                     delete_kbnode( node );
+                   }
                }
            }
        }
+       else if( (node->flag & 4) ) /* marked for deletion */
+           delete_kbnode( node );
     }
 
     /* note: because keyblock is the public key, it is never marked
@@ -822,6 +1133,173 @@ delete_inv_parts( const char *fname, KBNODE keyblock, u32 *keyid )
 
 
 /****************
+ * It may happen that the imported keyblock has duplicated user IDs.
+ * We check this here and collapse those user IDs together with their
+ * sigs into one.
+ * Returns: True if the keyblock hash changed.
+ */
+int
+collapse_uids( KBNODE *keyblock )
+{
+    KBNODE n, n2;
+    int in_uid;
+    int any=0;
+    u32 kid1;
+
+  restart:
+    for( n = *keyblock; n; n = n->next ) {
+       if( n->pkt->pkttype != PKT_USER_ID )
+           continue;
+       for( n2 = n->next; n2; n2 = n2->next ) {
+           if( n2->pkt->pkttype == PKT_USER_ID
+               && !cmp_user_ids( n->pkt->pkt.user_id,
+                                 n2->pkt->pkt.user_id ) ) {
+               /* found a duplicate */
+               any = 1;
+               if( !n2->next
+                   || n2->next->pkt->pkttype == PKT_USER_ID
+                   || n2->next->pkt->pkttype == PKT_PUBLIC_SUBKEY
+                   || n2->next->pkt->pkttype == PKT_SECRET_SUBKEY  ) {
+                   /* no more signatures: delete the user ID
+                    * and start over */
+                   remove_kbnode( keyblock, n2 );
+               }
+               else {
+                   /* The simple approach: Move one signature and
+                    * then start over to delete the next one :-( */
+                   move_kbnode( keyblock, n2->next, n->next );
+               }
+               goto restart;
+           }
+       }
+    }
+    if( !any )
+       return 0;
+
+  restart_sig:
+    /* now we may have duplicate signatures on one user ID: fix this */
+    for( in_uid = 0, n = *keyblock; n; n = n->next ) {
+       if( n->pkt->pkttype == PKT_USER_ID )
+           in_uid = 1;
+       else if( n->pkt->pkttype == PKT_PUBLIC_SUBKEY
+                || n->pkt->pkttype == PKT_SECRET_SUBKEY )
+           in_uid = 0;
+       else if( in_uid ) {
+           n2 = n;
+           do {
+               KBNODE ncmp = NULL;
+               for( ; n2; n2 = n2->next ) {
+                   if(    n2->pkt->pkttype == PKT_USER_ID
+                       || n2->pkt->pkttype == PKT_PUBLIC_SUBKEY
+                       || n2->pkt->pkttype == PKT_SECRET_SUBKEY )
+                       break;
+                   if( n2->pkt->pkttype != PKT_SIGNATURE )
+                       ;
+                   else if( !ncmp )
+                       ncmp = n2;
+                   else if( !cmp_signatures( ncmp->pkt->pkt.signature,
+                                               n2->pkt->pkt.signature )) {
+                       remove_kbnode( keyblock, n2 );
+                       goto restart_sig;
+                   }
+               }
+               n2 = ncmp? ncmp->next : NULL;
+           } while( n2 );
+       }
+    }
+
+    if( (n = find_kbnode( *keyblock, PKT_PUBLIC_KEY )) )
+       kid1 = keyid_from_pk( n->pkt->pkt.public_key, NULL );
+    else if( (n = find_kbnode( *keyblock, PKT_SECRET_KEY )) )
+       kid1 = keyid_from_sk( n->pkt->pkt.secret_key, NULL );
+    else
+       kid1 = 0;
+    log_info(_("key %08lX: duplicated user ID detected - merged\n"),
+                                                                (ulong)kid1);
+
+    return 1;
+}
+
+/* Check for a 0x20 revocation from a revocation key that is not
+   present.  This gets called without the benefit of merge_xxxx so you
+   can't rely on pk->revkey and friends. */
+static void
+revocation_present(KBNODE keyblock)
+{
+  KBNODE onode,inode;
+  PKT_public_key *pk=keyblock->pkt->pkt.public_key;
+
+  for(onode=keyblock->next;onode;onode=onode->next)
+    {
+      /* If we reach user IDs, we're done. */
+      if(onode->pkt->pkttype==PKT_USER_ID)
+       break;
+
+      if(onode->pkt->pkttype==PKT_SIGNATURE &&
+        onode->pkt->pkt.signature->sig_class==0x1F &&
+        onode->pkt->pkt.signature->revkey)
+       {
+         int idx;
+         PKT_signature *sig=onode->pkt->pkt.signature;
+
+         for(idx=0;idx<sig->numrevkeys;idx++)
+           {
+             u32 keyid[2];
+
+             keyid_from_fingerprint(sig->revkey[idx]->fpr,
+                                    MAX_FINGERPRINT_LEN,keyid);
+
+             for(inode=keyblock->next;inode;inode=inode->next)
+               {
+                 /* If we reach user IDs, we're done. */
+                 if(inode->pkt->pkttype==PKT_USER_ID)
+                   break;
+
+                 if(inode->pkt->pkttype==PKT_SIGNATURE &&
+                    inode->pkt->pkt.signature->sig_class==0x20 &&
+                    inode->pkt->pkt.signature->keyid[0]==keyid[0] &&
+                    inode->pkt->pkt.signature->keyid[1]==keyid[1])
+                   {
+                     /* Okay, we have a revocation key, and a
+                         revocation issued by it.  Do we have the key
+                         itself? */
+                     int rc;
+
+                     rc=get_pubkey_byfprint(NULL,sig->revkey[idx]->fpr,
+                                            MAX_FINGERPRINT_LEN);
+                     if(rc==G10ERR_NO_PUBKEY || rc==G10ERR_UNU_PUBKEY)
+                       {
+                         /* No, so try and get it */
+                         if(opt.keyserver_scheme &&
+                            opt.keyserver_options.auto_key_retrieve)
+                           {
+                             log_info(_("Warning: key %08lX may be revoked: "
+                                        "fetching revocation key %08lX\n"),
+                                      (ulong)keyid_from_pk(pk,NULL),
+                                      (ulong)keyid[1]);
+                             keyserver_import_fprint(sig->revkey[idx]->fpr,
+                                                     MAX_FINGERPRINT_LEN);
+
+                             /* Do we have it now? */
+                             rc=get_pubkey_byfprint(NULL,
+                                                    sig->revkey[idx]->fpr,
+                                                    MAX_FINGERPRINT_LEN);
+                           }
+
+                         if(rc==G10ERR_NO_PUBKEY || rc==G10ERR_UNU_PUBKEY)
+                           log_info(_("Warning: key %08lX may be revoked: "
+                                      "revocation key %08lX not present.\n"),
+                                    (ulong)keyid_from_pk(pk,NULL),
+                                    (ulong)keyid[1]);
+                       }
+                   }
+               }
+           }
+       }
+    }
+}
+
+/****************
  * compare and merge the blocks
  *
  * o compare the signatures: If we already have this signature, check
@@ -861,16 +1339,49 @@ merge_blocks( const char *fname, KBNODE keyblock_orig, KBNODE keyblock,
                }
            }
            if( !found ) {
+               char *p=get_user_id_native(keyid);
+               KBNODE n2 = clone_kbnode(node);
+               insert_kbnode( keyblock_orig, n2, 0 );
+               n2->flag |= 1;
+                ++*n_sigs;
+               log_info(_("key %08lX: \"%s\" revocation certificate added\n"),
+                                        (ulong)keyid[1],p);
+               m_free(p);
+           }
+       }
+    }
+
+    /* 2nd: merge in any direct key (0x1F) sigs */
+    for(node=keyblock->next; node; node=node->next ) {
+       if( node->pkt->pkttype == PKT_USER_ID )
+           break;
+       else if( node->pkt->pkttype == PKT_SIGNATURE
+                && node->pkt->pkt.signature->sig_class == 0x1F )  {
+           /* check whether we already have this */
+           found = 0;
+           for(onode=keyblock_orig->next; onode; onode=onode->next ) {
+               if( onode->pkt->pkttype == PKT_USER_ID )
+                   break;
+               else if( onode->pkt->pkttype == PKT_SIGNATURE
+                        && onode->pkt->pkt.signature->sig_class == 0x1F
+                        && !cmp_signatures(onode->pkt->pkt.signature,
+                                           node->pkt->pkt.signature)) {
+                   found = 1;
+                   break;
+               }
+           }
+           if( !found ) {
                KBNODE n2 = clone_kbnode(node);
                insert_kbnode( keyblock_orig, n2, 0 );
                n2->flag |= 1;
-               log_info_f(fname, _("key %08lX: revocation certificate added\n"),
+                ++*n_sigs;
+               log_info( _("key %08lX: direct key signature added\n"),
                                         (ulong)keyid[1]);
            }
        }
     }
 
-    /* 2nd: try to merge new certificates in */
+    /* 3rd: try to merge new certificates in */
     for(onode=keyblock_orig->next; onode; onode=onode->next ) {
        if( !(onode->flag & 1) && onode->pkt->pkttype == PKT_USER_ID) {
            /* find the user id in the imported keyblock */
@@ -887,7 +1398,7 @@ merge_blocks( const char *fname, KBNODE keyblock_orig, KBNODE keyblock,
        }
     }
 
-    /* 3rd: add new user-ids */
+    /* 4th: add new user-ids */
     for(node=keyblock->next; node; node=node->next ) {
        if( node->pkt->pkttype == PKT_USER_ID) {
            /* do we have this in the original keyblock */
@@ -905,31 +1416,7 @@ merge_blocks( const char *fname, KBNODE keyblock_orig, KBNODE keyblock,
        }
     }
 
-    /* merge subkey certificates */
-    for(onode=keyblock_orig->next; onode; onode=onode->next ) {
-       if( !(onode->flag & 1)
-           &&  (   onode->pkt->pkttype == PKT_PUBLIC_SUBKEY
-                || onode->pkt->pkttype == PKT_SECRET_SUBKEY) ) {
-           /* find the subkey in the imported keyblock */
-           for(node=keyblock->next; node; node=node->next ) {
-               if( node->pkt->pkttype == PKT_PUBLIC_SUBKEY
-                   && !cmp_public_keys( onode->pkt->pkt.public_key,
-                                         node->pkt->pkt.public_key ) )
-                   break;
-               else if( node->pkt->pkttype == PKT_SECRET_SUBKEY
-                   && !cmp_secret_keys( onode->pkt->pkt.secret_key,
-                                         node->pkt->pkt.secret_key ) )
-                   break;
-           }
-           if( node ) { /* found: merge */
-               rc = merge_keysigs( onode, node, n_sigs, fname, keyid );
-               if( rc )
-                   return rc;
-           }
-       }
-    }
-
-    /* add new subkeys */
+    /* 5th: add new subkeys */
     for(node=keyblock->next; node; node=node->next ) {
        onode = NULL;
        if( node->pkt->pkttype == PKT_PUBLIC_SUBKEY ) {
@@ -962,13 +1449,37 @@ merge_blocks( const char *fname, KBNODE keyblock_orig, KBNODE keyblock,
        }
     }
 
+    /* 6th: merge subkey certificates */
+    for(onode=keyblock_orig->next; onode; onode=onode->next ) {
+       if( !(onode->flag & 1)
+           &&  (   onode->pkt->pkttype == PKT_PUBLIC_SUBKEY
+                || onode->pkt->pkttype == PKT_SECRET_SUBKEY) ) {
+           /* find the subkey in the imported keyblock */
+           for(node=keyblock->next; node; node=node->next ) {
+               if( node->pkt->pkttype == PKT_PUBLIC_SUBKEY
+                   && !cmp_public_keys( onode->pkt->pkt.public_key,
+                                         node->pkt->pkt.public_key ) )
+                   break;
+               else if( node->pkt->pkttype == PKT_SECRET_SUBKEY
+                   && !cmp_secret_keys( onode->pkt->pkt.secret_key,
+                                         node->pkt->pkt.secret_key ) )
+                   break;
+           }
+           if( node ) { /* found: merge */
+               rc = merge_keysigs( onode, node, n_sigs, fname, keyid );
+               if( rc )
+                   return rc;
+           }
+       }
+    }
+
+
     return 0;
 }
 
 
 /****************
  * append the userid starting with NODE and all signatures to KEYBLOCK.
- * Mark all new and copied packets by setting flag bit 0.
  */
 static int
 append_uid( KBNODE keyblock, KBNODE node, int *n_sigs,
@@ -977,11 +1488,6 @@ append_uid( KBNODE keyblock, KBNODE node, int *n_sigs,
     KBNODE n, n_where=NULL;
 
     assert(node->pkt->pkttype == PKT_USER_ID );
-    if( node->next->pkt->pkttype == PKT_USER_ID ) {
-       log_error_f(fname, _("key %08lX: our copy has no self-signature\n"),
-                                                 (ulong)keyid[1]);
-       return G10ERR_GENERAL;
-    }
 
     /* find the position */
     for( n = keyblock; n; n_where = n, n = n->next ) {
@@ -1030,18 +1536,13 @@ merge_sigs( KBNODE dst, KBNODE src, int *n_sigs,
 
     assert(dst->pkt->pkttype == PKT_USER_ID );
     assert(src->pkt->pkttype == PKT_USER_ID );
-    /* at least a self signature comes next to the user-ids */
-    assert(src->next->pkt->pkttype != PKT_USER_ID );
-    if( dst->next->pkt->pkttype == PKT_USER_ID ) {
-       log_error_f(fname, _("key %08lX: our copy has no self-signature\n"),
-                                                 (ulong)keyid[1]);
-       return 0;
-    }
-
 
     for(n=src->next; n && n->pkt->pkttype != PKT_USER_ID; n = n->next ) {
        if( n->pkt->pkttype != PKT_SIGNATURE )
            continue;
+       if( n->pkt->pkt.signature->sig_class == 0x18
+           || n->pkt->pkt.signature->sig_class == 0x28 )
+           continue; /* skip signatures which are only valid on subkeys */
        found = 0;
        for(n2=dst->next; n2 && n2->pkt->pkttype != PKT_USER_ID; n2 = n2->next){
            if( n2->pkt->pkttype == PKT_SIGNATURE
@@ -1154,4 +1655,3 @@ append_key( KBNODE keyblock, KBNODE node, int *n_sigs,
 
     return 0;
 }
-