pkgs/tools/security/gnupg/22-allow-import-of-previously-known-keys-even-without-UI.patch

   1 From: Vincent Breitmoser <look@my.amazin.horse>
   2 Date: Thu, 13 Jun 2019 21:27:42 +0200
   3 Subject: gpg: allow import of previously known keys, even without UIDs
   4
   5 * g10/import.c (import_one): Accept an incoming OpenPGP certificate that
   6 has no user id, as long as we already have a local variant of the cert
   7 that matches the primary key.
   8
   9 --
  10
  11 This fixes two of the three broken tests in import-incomplete.scm.
  12
  13 GnuPG-Bug-id: 4393
  14 Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
  15 ---
  16  g10/import.c | 44 +++++++++++---------------------------------
  17  1 file changed, 11 insertions(+), 33 deletions(-)
  18
  19
  20 diff --git a/g10/import.c b/g10/import.c
  21 index cd3363fc7..8f10771db 100644
  22 --- a/g10/import.c
  23 +++ b/g10/import.c
  24 @@ -1858,7 +1858,6 @@ import_one_real (ctrl_t ctrl,
  25    size_t an;
  26    char pkstrbuf[PUBKEY_STRING_SIZE];
  27    int merge_keys_done = 0;
  28 -  int any_filter = 0;
  29    KEYDB_HANDLE hd = NULL;
  30
  31    if (r_valid)
  32 @@ -1896,13 +1895,6 @@ import_one_real (ctrl_t ctrl,
  33      }
  34
  35
  36 -  if (!uidnode )
  37 -    {
  38 -      if (!silent)
  39 -        log_error( _("key %s: no user ID\n"), keystr_from_pk(pk));
  40 -      return 0;
  41 -    }
  42 -
  43    if (screener && screener (keyblock, screener_arg))
  44      {
  45        log_error (_("key %s: %s\n"), keystr_from_pk (pk),
  46 @@ -1977,18 +1969,10 @@ import_one_real (ctrl_t ctrl,
  47           }
  48      }
  49
  50 -  /* Delete invalid parts and bail out if there are no user ids left.  */
  51 -  if (!delete_inv_parts (ctrl, keyblock, keyid, options, otherrevsigs))
  52 -    {
  53 -      if (!silent)
  54 -        {
  55 -          log_error( _("key %s: no valid user IDs\n"), keystr_from_pk(pk));
  56 -          if (!opt.quiet )
  57 -            log_info(_("this may be caused by a missing self-signature\n"));
  58 -        }
  59 -      stats->no_user_id++;
  60 -      return 0;
  61 -    }
  62 +  /* Delete invalid parts, and note if we have any valid ones left.
  63 +   * We will later abort import if this key is new but contains
  64 +   * no valid uids.  */
  65 +  delete_inv_parts (ctrl, keyblock, keyid, options, otherrevsigs);
  66
  67    /* Get rid of deleted nodes.  */
  68    commit_kbnode (&keyblock);
  69 @@ -1998,24 +1982,11 @@ import_one_real (ctrl_t ctrl,
  70      {
  71        apply_keep_uid_filter (ctrl, keyblock, import_filter.keep_uid);
  72        commit_kbnode (&keyblock);
  73 -      any_filter = 1;
  74      }
  75    if (import_filter.drop_sig)
  76      {
  77        apply_drop_sig_filter (ctrl, keyblock, import_filter.drop_sig);
  78        commit_kbnode (&keyblock);
  79 -      any_filter = 1;
  80 -    }
  81 -
  82 -  /* If we ran any filter we need to check that at least one user id
  83 -   * is left in the keyring.  Note that we do not use log_error in
  84 -   * this case. */
  85 -  if (any_filter && !any_uid_left (keyblock))
  86 -    {
  87 -      if (!opt.quiet )
  88 -        log_info ( _("key %s: no valid user IDs\n"), keystr_from_pk (pk));
  89 -      stats->no_user_id++;
  90 -      return 0;
  91      }
  92
  93    /* The keyblock is valid and ready for real import.  */
  94 @@ -2073,6 +2044,13 @@ import_one_real (ctrl_t ctrl,
  95        err = 0;
  96        stats->skipped_new_keys++;
  97      }
  98 +  else if (err && !any_uid_left (keyblock))
  99 +    {
 100 +      if (!silent)
 101 +        log_info( _("key %s: new key but contains no user ID - skipped\n"), keystr(keyid));
 102 +      err = 0;
 103 +      stats->no_user_id++;
 104 +    }
 105    else if (err)  /* Insert this key. */
 106      {
 107        /* Note: ERR can only be NO_PUBKEY or UNUSABLE_PUBKEY.  */