diff options
| author | Werner Koch <[email protected]> | 2018-05-13 11:29:40 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2018-05-13 11:29:40 +0000 |
| commit | 7b7576637ddfb6e426e77a86b05af6d828e585d5 (patch) | |
| tree | 21919eed435194f8db1dac8150b581a731a66e26 /dirmngr/http-ntbtls.c | |
| parent | doc: Include release info from 2.2.6 (diff) | |
| parent | doc: Fix URL in NEWS. (diff) | |
| download | gnupg-7b7576637ddfb6e426e77a86b05af6d828e585d5.tar.gz gnupg-7b7576637ddfb6e426e77a86b05af6d828e585d5.zip | |
Merge branch 'STABLE-BRANCH-2-2' into master
--
Resolved Conflicts:
NEWS - removed
configure.ac - removed
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'dirmngr/http-ntbtls.c')
| -rw-r--r-- | dirmngr/http-ntbtls.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/dirmngr/http-ntbtls.c b/dirmngr/http-ntbtls.c index ea66a4d73..ed4cdd496 100644 --- a/dirmngr/http-ntbtls.c +++ b/dirmngr/http-ntbtls.c @@ -87,13 +87,15 @@ gnupg_http_tls_verify_cb (void *opaque, } else /* Use the certificates as requested from the HTTP module. */ { + if ((http_flags & HTTP_FLAG_TRUST_CFG)) + validate_flags |= VALIDATE_FLAG_TRUST_CONFIG; if ((http_flags & HTTP_FLAG_TRUST_DEF)) validate_flags |= VALIDATE_FLAG_TRUST_HKP; if ((http_flags & HTTP_FLAG_TRUST_SYS)) validate_flags |= VALIDATE_FLAG_TRUST_SYSTEM; /* If HKP trust is requested and there are no HKP certificates - * configured, also try thye standard system certificates. */ + * configured, also try the standard system certificates. */ if ((validate_flags & VALIDATE_FLAG_TRUST_HKP) && !cert_cache_any_in_class (CERTTRUST_CLASS_HKP)) validate_flags |= VALIDATE_FLAG_TRUST_SYSTEM; |