diff options
| author | Werner Koch <[email protected]> | 2017-09-26 10:00:03 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2017-09-26 10:00:03 +0000 |
| commit | cd2d758f3f9e0007ecd6bae9d2ee0d631773e237 (patch) | |
| tree | 0e1b9c898d0527969fa953e0f1fc418e610c8da4 /dirmngr/http-ntbtls.c | |
| parent | g10: Select a secret key by checking availability under gpg-agent. (diff) | |
| parent | po: Remove trailing colon from a German pinentry string. (diff) | |
| download | gnupg-cd2d758f3f9e0007ecd6bae9d2ee0d631773e237.tar.gz gnupg-cd2d758f3f9e0007ecd6bae9d2ee0d631773e237.zip | |
Merge branch 'STABLE-BRANCH-2-2' into master
--
Signed-off-by: Werner Koch <[email protected]>
Conflicts:
NEWS - include release info from 2.2.1
configure.ac - keep master.
Diffstat (limited to 'dirmngr/http-ntbtls.c')
| -rw-r--r-- | dirmngr/http-ntbtls.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/dirmngr/http-ntbtls.c b/dirmngr/http-ntbtls.c index 250db556c..ea66a4d73 100644 --- a/dirmngr/http-ntbtls.c +++ b/dirmngr/http-ntbtls.c @@ -91,6 +91,12 @@ gnupg_http_tls_verify_cb (void *opaque, 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. */ + if ((validate_flags & VALIDATE_FLAG_TRUST_HKP) + && !cert_cache_any_in_class (CERTTRUST_CLASS_HKP)) + validate_flags |= VALIDATE_FLAG_TRUST_SYSTEM; } if ((http_flags & HTTP_FLAG_NO_CRL)) |