* keyserver.c (keyserver_import_pka): New. Moved from

getkey.c:get_pubkey_byname which was getting crowded.

* keyserver.c (keyserver_import_cert): Import a key found in DNS via CERT
records.  Can handle both the PGP (actual key) and IPGP (URL) CERT types.

* getkey.c (get_pubkey_byname): Call them both here.

* options.h, keyserver.c (parse_keyserver_options): Add
"auto-cert-retrieve" option with optional max size argument.

1 files changed, 6 insertions, 11 deletions

diff --git a/g10/gpgv.c b/g10/gpgv.c
index bd5820da7..dbff4831c 100644
--- a/g10/gpgv.c
+++ b/g10/gpgv.c
@@ -270,7 +270,7 @@ get_ownertrust (PKT_public_key *pk)
 }
 
 
-/* Stub:
+/* Stubs:
  * Because we only work with trusted keys, it does not make sense to
  * get them from a keyserver
  */
@@ -280,19 +280,14 @@ keyserver_import_keyid( u32 *keyid, void *dummy )
     return -1;
 }
 
-/* Stub:
- * Because we only work with trusted keys, it does not make sense to
- * get them from a keyserver
- */
 int
-keyserver_import_fprint (const byte *fprint, size_t fprint_len,
-                         struct keyserver_spec *keyserver)
-{
-    return -1;
-}
+keyserver_import_cert(const char *name) { return -1; }
+
+int
+keyserver_import_pka(const char *name) { return -1; }
 
 int
-keyserver_getname(const char *name) { return -1; }
+keyserver_import_name(const char *name) { return -1; }
 
 /* Stub:
  * No encryption here but mainproc links to these functions.