diff options
Diffstat (limited to '')
| -rw-r--r-- | common/dns-cert.c (renamed from util/cert.c) | 39 |
1 files changed, 17 insertions, 22 deletions
diff --git a/util/cert.c b/common/dns-cert.c index 1b3390b80..8dfcb9724 100644 --- a/util/cert.c +++ b/common/dns-cert.c @@ -1,4 +1,4 @@ -/* cert.c - DNS CERT code +/* dns-cert.c - DNS CERT code * Copyright (C) 2005, 2006 Free Software Foundation, Inc. * * This file is part of GNUPG. @@ -22,18 +22,19 @@ #include <config.h> #include <sys/types.h> #ifdef USE_DNS_CERT -#ifdef _WIN32 -#include <windows.h> -#else -#include <netinet/in.h> -#include <arpa/nameser.h> -#include <resolv.h> -#endif +# ifdef HAVE_W32_SYSTEM +# include <windows.h> +# else +# include <netinet/in.h> +# include <arpa/nameser.h> +# include <resolv.h> +# endif #include <string.h> -#include "memory.h" #endif -#include "iobuf.h" + #include "util.h" +#include "iobuf.h" +#include "dns-cert.h" /* Not every installation has gotten around to supporting CERTs yet... */ @@ -41,14 +42,14 @@ #define T_CERT 37 #endif -#ifdef USE_DNS_CERT /* Returns -1 on error, 0 for no answer, 1 for PGP provided and 2 for IPGP provided. */ int -get_cert(const char *name,size_t max_size,IOBUF *iobuf, - unsigned char **fpr,size_t *fpr_len,char **url) +get_dns_cert (const char *name,size_t max_size,IOBUF *iobuf, + unsigned char **fpr,size_t *fpr_len,char **url) { +#ifdef USE_DNS_CERT unsigned char *answer; int r,ret=-1; u16 count; @@ -181,18 +182,12 @@ get_cert(const char *name,size_t max_size,IOBUF *iobuf, xfree(answer); return ret; -} - #else /* !USE_DNS_CERT */ - -int -get_cert(const char *name,size_t max_size,IOBUF *iobuf, - unsigned char **fpr,size_t *fpr_len,char **url) -{ return -1; +#endif } -#endif + /* Test with simon.josefsson.org */ @@ -214,7 +209,7 @@ main(int argc,char *argv[]) printf("CERT lookup on %s\n",argv[1]); - rc=get_cert(argv[1],16384,&iobuf,&fpr,&fpr_len,&url); + rc=get_dns_cert (argv[1],16384,&iobuf,&fpr,&fpr_len,&url); if(rc==-1) printf("error\n"); else if(rc==0) |