From 154f3ed2bf64de801ae0f9796338a2767ec6357b Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Thu, 23 Apr 2015 15:42:56 +0200 Subject: 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 --- common/dns-cert.h | 55 ------------------------------------------------------- 1 file changed, 55 deletions(-) delete mode 100644 common/dns-cert.h (limited to 'common/dns-cert.h') diff --git a/common/dns-cert.h b/common/dns-cert.h deleted file mode 100644 index 4b49efc1c..000000000 --- a/common/dns-cert.h +++ /dev/null @@ -1,55 +0,0 @@ -/* dns-cert.h - DNS CERT definition - * Copyright (C) 2006 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 . - */ -#ifndef GNUPG_COMMON_DNS_CERT_H -#define GNUPG_COMMON_DNS_CERT_H - - -#define DNS_CERTTYPE_ANY 0 /* Internal catch all type. */ -/* Certificate types according to RFC-4398: */ -#define DNS_CERTTYPE_PKIX 1 /* X.509 as per PKIX. */ -#define DNS_CERTTYPE_SPKI 2 /* SPKI certificate. */ -#define DNS_CERTTYPE_PGP 3 /* OpenPGP packet. */ -#define DNS_CERTTYPE_IPKIX 4 /* The URL of an X.509 data object. */ -#define DNS_CERTTYPE_ISPKI 5 /* The URL of an SPKI certificate. */ -#define DNS_CERTTYPE_IPGP 6 /* The fingerprint - and URL of an OpenPGP packet. */ -#define DNS_CERTTYPE_ACPKIX 7 /* Attribute Certificate. */ -#define DNS_CERTTYPE_IACPKIX 8 /* The URL of an Attribute Certificate. */ -#define DNS_CERTTYPE_URI 253 /* URI private. */ -#define DNS_CERTTYPE_OID 254 /* OID private. */ - - -gpg_error_t get_dns_cert (const char *name, int want_certtype, - estream_t *r_key, - unsigned char **r_fpr, size_t *r_fprlen, - char **r_url); - - - -#endif /*GNUPG_COMMON_DNS_CERT_H*/ -- cgit v1.2.3