security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-14 21:47:19 +02:00
Code Activity

* gpgkeys_curl.c (main): If the http-proxy option is given without any

Browse source 
arguments, try to get the proxy from the environment.

* ksutil.h, ksutil.c (curl_err_to_gpg_err, curl_writer): Copy from
gpgkeys_curl.c.

* gpgkeys_oldhkp.c: Copy from gpgkeys_hkp.c.
This commit is contained in:
David Shaw 2005-04-16 18:50:46 +00:00
parent 799f97ceee
commit 5748f595b0
5 changed files with 1239 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

14
keyserver/ksutil.h
View file

@ -21,6 +21,12 @@
#ifndef _KSUTIL_H_
#define _KSUTIL_H_
#ifdef FAKE_CURL
#include "curl-shim.h"
#else
#include <curl/curl.h>
#endif
#define GET 0
#define SEND 1
#define SEARCH 2
@ -47,6 +53,12 @@
#define BEGIN "-----BEGIN PGP PUBLIC KEY BLOCK-----"
#define END "-----END PGP PUBLIC KEY BLOCK-----"
#ifdef __riscos__
#define HTTP_PROXY_ENV "GnuPG$HttpProxy"
#else
#define HTTP_PROXY_ENV "http_proxy"
#endif
struct keylist
{
char str[MAX_LINE];
@ -88,5 +100,7 @@ void free_ks_options(struct ks_options *opt);
int parse_ks_options(char *line,struct ks_options *opt);
const char *ks_action_to_string(enum ks_action action);
void print_nocr(FILE *stream,const char *str);
int curl_err_to_gpg_err(CURLcode error);
size_t curl_writer(const void *ptr,size_t size,size_t nmemb,void *stream);
#endif /* !_KSUTIL_H_ */