aboutsummaryrefslogtreecommitdiffstats
path: root/g10/gpg.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2019-07-04 13:45:39 +0000
committerWerner Koch <[email protected]>2019-07-04 13:59:14 +0000
commit2b7151b0a57f5fe7d67fd76dfa1ba7a8731642c6 (patch)
tree909829f67d43a68c42919e3df7d491a1f01ec645 /g10/gpg.c
parentgpg: Avoid printing false AKL error message. (diff)
downloadgnupg-2b7151b0a57f5fe7d67fd76dfa1ba7a8731642c6.tar.gz
gnupg-2b7151b0a57f5fe7d67fd76dfa1ba7a8731642c6.zip
gpg: Add "self-sigs-only" and "import-clean" to the keyserver options.
* g10/gpg.c (main): Change default. -- Due to the DoS attack on the keyeservers we do not anymore default to import key signatures. That makes the keyserver unsuable for getting keys for the WoT but it still allows to retriev keys - even if that takes long to download the large keyblocks. To revert to the old behavior add keyserver-optiions no-self-sigs-only,no-import-clean to gpg.conf. GnuPG-bug-id: 4607 Signed-off-by: Werner Koch <[email protected]> (cherry picked from commit 23c978640812d123eaffd4108744bdfcf48f7c93)
Diffstat (limited to '')
-rw-r--r--g10/gpg.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/g10/gpg.c b/g10/gpg.c
index d57146bb4..2c784d491 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -2375,7 +2375,9 @@ main (int argc, char **argv)
opt.import_options = IMPORT_REPAIR_KEYS;
opt.export_options = EXPORT_ATTRIBUTES;
opt.keyserver_options.import_options = (IMPORT_REPAIR_KEYS
- | IMPORT_REPAIR_PKS_SUBKEY_BUG);
+ | IMPORT_REPAIR_PKS_SUBKEY_BUG
+ | IMPORT_SELF_SIGS_ONLY
+ | IMPORT_CLEAN);
opt.keyserver_options.export_options = EXPORT_ATTRIBUTES;
opt.keyserver_options.options = KEYSERVER_HONOR_PKA_RECORD;
opt.verify_options = (LIST_SHOW_UID_VALIDITY