gpg: Move all DNS access to Dirmngr.

* common/dns-cert.h: Move to ../dirmngr/.
* common/dns-cert.c: Move to ../dirmngr/.  Change args to return the
key as a buffer.
* common/t-dns-cert.c: Move to ../dirmngr/.
* common/pka.c, common/pka.h, common/t-pka.c: Remove.

* dirmngr/server.c (data_line_cookie_write): Factor code out to
data_line_write and make it a wrapper for that.
(data_line_write): New.
(cmd_dns_cert): New.
(register_commands): Register new command.

* g10/Makefile.am (LDADD): Remove DNSLIBS.
* g10/call-dirmngr.c (dns_cert_parm_s): New.
(dns_cert_data_cb, dns_cert_status_cb): New.
(gpg_dirmngr_dns_cert): New.
(gpg_dirmngr_get_pka): New.
* g10/gpgv.c (gpg_dirmngr_get_pka): New dummy function.
* g10/keyserver.c (keyserver_import_cert): Replace get_dns_cert by
gpg_dirmngr_dns_cert.
(keyserver_import_pka): Replace get_pka_info by gpg_dirmngr_get_pka.
* g10/mainproc.c: Include call-dirmngr.h.
(pka_uri_from_sig): Add CTX arg. Replace get_pka_info by
gpg_dirmngr_get_pka.
--

With this patch gpg does not do any network access itself but uses
dirmngr for that.  Note that we need to keep linking to NETLIBS due to
the logging code and because we need TCP for our socket emulation
under Windows.  Probably also required for Solaris etc.

Signed-off-by: Werner Koch <[email protected]>

1 files changed, 0 insertions, 107 deletions

diff --git a/common/pka.c b/common/pka.c
deleted file mode 100644
index 1aa5b3343..000000000
--- a/common/pka.c
+++ /dev/null
@@ -1,107 +0,0 @@
-/* pka.c - DNS Public Key Association RR access
- * Copyright (C) 2005, 2009 Free Software Foundation, Inc.
- *
- * This file is part of GnuPG.
- *
- * This file is free software; you can redistribute it and/or modify
- * it under the terms of either
- *
- *   - the GNU Lesser General Public License as published by the Free
- *     Software Foundation; either version 3 of the License, or (at
- *     your option) any later version.
- *
- * or
- *
- *   - the GNU General Public License as published by the Free
- *     Software Foundation; either version 2 of the License, or (at
- *     your option) any later version.
- *
- * or both in parallel, as here.
- *
- * This file is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <config.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "util.h"
-#include "mbox-util.h"
-#include "dns-cert.h"
-#include "pka.h"
-
-
-/* For the given email ADDRESS lookup the PKA information in the DNS.
-
-   On success the fingerprint is stored at FPRBUF and the URI will be
-   returned in an allocated buffer.  Note that the URI might be a zero
-   length string as this information is optional.  Caller must xfree
-   the returned string.  FPRBUFLEN gives the size of the expected
-   fingerprint (usually 20).
-
-   On error NULL is returned and the FPRBUF is not defined. */
-char *
-get_pka_info (const char *address, void *fprbuf, size_t fprbuflen)
-{
-  char *result = NULL;
-  char *mbox;
-  char *domain;  /* Points to mbox.  */
-  char hashbuf[20];
-  char *hash = NULL;
-  char *name = NULL;
-  unsigned char *fpr = NULL;
-  size_t fpr_len;
-  char *url = NULL;
-
-  mbox = mailbox_from_userid (address);
-  if (!mbox)
-    goto leave;
-  domain = strchr (mbox, '@');
-  if (!domain)
-    goto leave;
-  *domain++ = 0;
-
-  gcry_md_hash_buffer (GCRY_MD_SHA1, hashbuf, mbox, strlen (mbox));
-  hash = zb32_encode (hashbuf, 8*20);
-  if (!hash)
-    goto leave;
-  name = strconcat (hash, "._pka.", domain, NULL);
-  if (!name)
-    goto leave;
-
-  if (get_dns_cert (name, DNS_CERTTYPE_IPGP, NULL, &fpr, &fpr_len, &url))
-    goto leave;
-  if (!fpr)
-    goto leave;
-
-  /* Return the fingerprint.  */
-  if (fpr_len != fprbuflen)
-    {
-      /* fprintf (stderr, "get_dns_cert failed: fprlen (%zu/%zu)\n", */
-      /*          fpr_len, fprbuflen); */
-      goto leave;
-    }
-  memcpy (fprbuf, fpr, fpr_len);
-
-  /* We return the URL or an empty string.  */
-  if (!url)
-    url = xtrycalloc (1, 1);
-  result = url;
-  url = NULL;
-
- leave:
-  xfree (fpr);
-  xfree (url);
-  xfree (name);
-  xfree (hash);
-  xfree (mbox);
-  return result;
-}