From dc4c7f65e32a0cddc075d06fa0132e099bcb6455 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Thu, 11 Apr 2019 09:54:28 +0200 Subject: [PATCH] gpg: Accept also armored data from the WKD. * g10/keyserver.c (keyserver_import_wkd): Clear NO_ARMOR. -- We may even adjust the specs to allow that. It should not be a problem for any OpenPGP implementation because armored keys are very common and de-armoring code is de-facto a mandatory feature. Signed-off-by: Werner Koch --- g10/keyserver.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/g10/keyserver.c b/g10/keyserver.c index 8509d8314..865e1e94b 100644 --- a/g10/keyserver.c +++ b/g10/keyserver.c @@ -2072,8 +2072,9 @@ keyserver_import_wkd (ctrl_t ctrl, const char *name, int quick, int armor_status = opt.no_armor; import_filter_t save_filt; - /* Keys returned via WKD are in binary format. */ - opt.no_armor = 1; + /* Keys returned via WKD are in binary format. However, we + * relax that requirement and allow also for armored data. */ + opt.no_armor = 0; save_filt = save_and_clear_import_filter (); if (!save_filt) err = gpg_error_from_syserror ();