aboutsummaryrefslogtreecommitdiffstats
path: root/dirmngr/http.h
diff options
context:
space:
mode:
authorJustus Winter <[email protected]>2017-07-18 10:53:55 +0000
committerJustus Winter <[email protected]>2017-07-18 11:56:33 +0000
commitb231959728a0056094134e0fca8cc916c24ef37e (patch)
tree0dce1a2f158ac5b1fa6fe492bc95fcb937668f27 /dirmngr/http.h
parentdirmngr: Fix memory leak. (diff)
downloadgnupg-b231959728a0056094134e0fca8cc916c24ef37e.tar.gz
gnupg-b231959728a0056094134e0fca8cc916c24ef37e.zip
dirmngr: Honor http keyserver URLs.
* dirmngr/http.c (parse_uri): Keep an unmodified copy of the URI. * dirmngr/http.h (struct parsed_uri_s): New field 'original'. * dirmngr/ks-action.c (ks_action_get): Properly handle http and https URLs. -- If a key has a http or https URL as preferred keyserver, fetch the key from there. Previously, dirmngr unconditionally interpreted these URLs as hkp servers. GnuPG-bug-id: 2924 Signed-off-by: Justus Winter <[email protected]>
Diffstat (limited to 'dirmngr/http.h')
-rw-r--r--dirmngr/http.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/dirmngr/http.h b/dirmngr/http.h
index 448cd0430..9fa462c05 100644
--- a/dirmngr/http.h
+++ b/dirmngr/http.h
@@ -47,6 +47,7 @@ typedef struct uri_tuple_s *uri_tuple_t;
struct parsed_uri_s
{
/* All these pointers point into BUFFER; most stuff is not escaped. */
+ char *original; /* Unmodified copy of the parsed URI. */
char *scheme; /* Pointer to the scheme string (always lowercase). */
unsigned int is_http:1; /* This is a HTTP style URI. */
unsigned int use_tls:1; /* Whether TLS should be used. */