GnuPG with scdaemon_shared-access patch applied
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
 
 

55 lines
2.0 KiB

  1. From 1690a464b28fa24ce82189a9bf5d7ce9b44804b8 Mon Sep 17 00:00:00 2001
  2. From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
  3. Date: Mon, 15 Jul 2019 16:24:35 -0400
  4. Subject: [PATCH 3/7] gpg: drop import-clean from default keyserver import
  5. options
  6. * g10/gpg.c (main): drop IMPORT_CLEAN from the
  7. default opt.keyserver_options.import_options
  8. * doc/gpg.texi: reflect this change in the documentation
  9. Given that SELF_SIGS_ONLY is already set, it's not clear what
  10. additional benefit IMPORT_CLEAN provides. Furthermore, IMPORT_CLEAN
  11. means that receiving an OpenPGP certificate from a keyserver will
  12. potentially delete data that is otherwise held in the local keyring,
  13. which is surprising to users who expect retrieval from the keyservers
  14. to be purely additive.
  15. GnuPG-Bug-Id: 4628
  16. Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
  17. ---
  18. doc/gpg.texi | 2 +-
  19. g10/gpg.c | 3 +--
  20. 2 files changed, 2 insertions(+), 3 deletions(-)
  21. diff --git a/doc/gpg.texi b/doc/gpg.texi
  22. index 4870441d4..551459a74 100644
  23. --- a/doc/gpg.texi
  24. +++ b/doc/gpg.texi
  25. @@ -1963,7 +1963,7 @@ are available for all keyserver types, some common options are:
  26. @end table
  27. -The default list of options is: "self-sigs-only, import-clean,
  28. +The default list of options is: "self-sigs-only,
  29. repair-keys, repair-pks-subkey-bug, export-attributes,
  30. honor-pka-record".
  31. diff --git a/g10/gpg.c b/g10/gpg.c
  32. index 68cc22041..fa2bcfa5e 100644
  33. --- a/g10/gpg.c
  34. +++ b/g10/gpg.c
  35. @@ -2397,8 +2397,7 @@ main (int argc, char **argv)
  36. opt.export_options = EXPORT_ATTRIBUTES;
  37. opt.keyserver_options.import_options = (IMPORT_REPAIR_KEYS
  38. | IMPORT_REPAIR_PKS_SUBKEY_BUG
  39. - | IMPORT_SELF_SIGS_ONLY
  40. - | IMPORT_CLEAN);
  41. + | IMPORT_SELF_SIGS_ONLY);
  42. opt.keyserver_options.export_options = EXPORT_ATTRIBUTES;
  43. opt.keyserver_options.options = KEYSERVER_HONOR_PKA_RECORD;
  44. opt.verify_options = (LIST_SHOW_UID_VALIDITY
  45. --
  46. 2.27.0