diff options
| author | Werner Koch <wk@gnupg.org> | 2018-04-25 12:37:34 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2018-04-25 12:38:04 +0200 |
| commit | 1de4462974113ac18cf98f903e97cd1127fa842f (patch) | |
| tree | 4a6bb39fa00a2dcee2dc9bfe635821bd3f8832a8 /dirmngr/loadswdb.c | |
| parent | dirmngr: Implement CRL fetching via https. (diff) | |
| download | gnupg2-1de4462974113ac18cf98f903e97cd1127fa842f.tar.xz gnupg2-1de4462974113ac18cf98f903e97cd1127fa842f.zip | |
dirmngr: Allow redirection from https to http for CRLs
* dirmngr/ks-engine.h (KS_HTTP_FETCH_NOCACHE): New flag.
(KS_HTTP_FETCH_TRUST_CFG): Ditto.
(KS_HTTP_FETCH_NO_CRL): Ditto.
(KS_HTTP_FETCH_ALLOW_DOWNGRADE): Ditto.
* dirmngr/ks-engine-http.c (ks_http_fetch): Replace args send_no_cache
and extra_http_trust_flags by a new flags arg. Allow redirectiong
from https to http it KS_HTTP_FETCH_ALLOW_DOWNGRADE is set.
* dirmngr/loadswdb.c (fetch_file): Call with KS_HTTP_FETCH_NOCACHE.
* dirmngr/ks-action.c (ks_action_get): Ditto.
(ks_action_fetch): Ditto.
* dirmngr/crlfetch.c (crl_fetch): Call with the appropriate flags.
--
Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to '')
| -rw-r--r-- | dirmngr/loadswdb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dirmngr/loadswdb.c b/dirmngr/loadswdb.c index dfa027386..fb883722a 100644 --- a/dirmngr/loadswdb.c +++ b/dirmngr/loadswdb.c @@ -126,7 +126,7 @@ fetch_file (ctrl_t ctrl, const char *url, estream_t *r_fp) size_t nread, nwritten; char buffer[1024]; - if ((err = ks_http_fetch (ctrl, url, 1, 0, &httpfp))) + if ((err = ks_http_fetch (ctrl, url, KS_HTTP_FETCH_NOCACHE, &httpfp))) goto leave; /* We now read the data from the web server into a memory buffer. |