mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
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>
This commit is contained in:
parent
705d8e9cf0
commit
1de4462974
5 changed files with 40 additions and 21 deletions
|
@ -257,7 +257,8 @@ ks_action_get (ctrl_t ctrl, uri_item_t keyservers,
|
|||
if (is_hkp_s)
|
||||
err = ks_hkp_get (ctrl, uri->parsed_uri, sl->d, &infp);
|
||||
else if (is_http_s)
|
||||
err = ks_http_fetch (ctrl, uri->parsed_uri->original, 1, 0,
|
||||
err = ks_http_fetch (ctrl, uri->parsed_uri->original,
|
||||
KS_HTTP_FETCH_NOCACHE,
|
||||
&infp);
|
||||
else
|
||||
BUG ();
|
||||
|
@ -315,7 +316,7 @@ ks_action_fetch (ctrl_t ctrl, const char *url, estream_t outfp)
|
|||
|
||||
if (parsed_uri->is_http)
|
||||
{
|
||||
err = ks_http_fetch (ctrl, url, 1, 0, &infp);
|
||||
err = ks_http_fetch (ctrl, url, KS_HTTP_FETCH_NOCACHE, &infp);
|
||||
if (!err)
|
||||
{
|
||||
err = copy_stream (infp, outfp);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue