security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00
Code Activity

Make HKP keyserver engine work again.

Browse source 
We had some debug code here which prevented it from working.
The host selection code still needs a review!

	* ks-engine-http.c (ks_http_help): Do not print help for hkp.
	* ks-engine-hkp.c (ks_hkp_help): Print help only for hkp.
	(send_request): Remove test code.
	(map_host): Use xtrymalloc.

	* certcache.c (classify_pattern): Remove unused variable and make
	explicit substring search work.
This commit is contained in:
Werner Koch 2011-11-24 15:48:24 +01:00
parent 725d3589ad
commit 231d27e0fe
6 changed files with 20 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
dirmngr/ks-engine-hkp.c
View file

@ -209,7 +209,7 @@ map_host (const char *name)
int refidx;
reftblsize = 100;
reftbl = xmalloc (reftblsize * sizeof *reftbl);
reftbl = xtrymalloc (reftblsize * sizeof *reftbl);
if (!reftbl)
return NULL;
refidx = 0;
@ -280,7 +280,7 @@ map_host (const char *name)
else
{
if (ai->ai_family == AF_INET)
hosttable[tmpidx]->v4 = 1;
hosttable[tmpidx]->v4 = 1;
if (ai->ai_family == AF_INET6)
hosttable[tmpidx]->v6 = 1;
@ -409,7 +409,7 @@ ks_hkp_help (ctrl_t ctrl, parsed_uri_t uri)
if (!uri)
err = ks_print_help (ctrl, " hkp");
else if (uri->is_http)
else if (uri->is_http && !strcmp (uri->scheme, "hkp"))
err = ks_print_help (ctrl, data);
else
err = 0;
@ -472,7 +472,7 @@ send_request (ctrl_t ctrl, const char *request, const char *hostportstr,
char *request_buffer = NULL;
*r_fp = NULL;
return gpg_error (GPG_ERR_NOT_SUPPORTED);
once_more:
err = http_open (&http,
post_cb? HTTP_REQ_POST : HTTP_REQ_GET,