diff options
| author | Thomas E. Dickey <dickey@invisible-island.net> | 2015-01-25 17:35:28 -0500 |
|---|---|---|
| committer | Thomas E. Dickey <dickey@invisible-island.net> | 2015-01-25 17:35:28 -0500 |
| commit | 4b7192fcc61053dea1c187caf2d30bbdac8733cb (patch) | |
| tree | bd3373d957d46cf8c0a6b60f0e75fc7a500f6bc0 /WWW/Library/Implementation | |
| parent | 55df51e6ca5ebf5cd5910179f5e03b7a275a3e5d (diff) | |
| download | lynx-snapshots-4b7192fcc61053dea1c187caf2d30bbdac8733cb.tar.gz | |
snapshot of project "lynx", label v2-8-9dev_3a
Diffstat (limited to 'WWW/Library/Implementation')
| -rw-r--r-- | WWW/Library/Implementation/HTTP.c | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/WWW/Library/Implementation/HTTP.c b/WWW/Library/Implementation/HTTP.c index bc3adff5..d7088fb4 100644 --- a/WWW/Library/Implementation/HTTP.c +++ b/WWW/Library/Implementation/HTTP.c @@ -1,5 +1,5 @@ /* - * $LynxId: HTTP.c,v 1.136 2014/11/30 22:51:30 tom Exp $ + * $LynxId: HTTP.c,v 1.137 2015/01/25 16:58:33 tom Exp $ * * HyperText Tranfer Protocol - Client implementation HTTP.c * ========================== @@ -782,9 +782,24 @@ static int HTLoadHTTP(const char *arg, GNUTLS_VERIFY_DO_NOT_ALLOW_SAME | GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT); ret = gnutls_certificate_verify_peers2(handle->gnutls_state, &tls_status); - if (ret < 0 || (ret == 0 && - tls_status & GNUTLS_CERT_SIGNER_NOT_FOUND)) { + if (ret < 0 || tls_status != 0) { int flag_continue = 1; + +#if GNUTLS_VERSION_NUMBER >= 0x030104 + int type; + gnutls_datum_t out; + + if (ret < 0) { + HTSprintf0(&msg, SSL_FORCED_PROMPT, + gettext("GnuTLS error when trying to verify certificate.")); + } else { + type = gnutls_certificate_type_get(handle->gnutls_state); + ret = gnutls_certificate_verification_status_print(tls_status, + type, &out, 0); + HTSprintf0(&msg, SSL_FORCED_PROMPT, out.data); + gnutls_free(out.data); + } +#else char *msg2; if (ret == 0 && tls_status & GNUTLS_CERT_SIGNER_NOT_FOUND) { @@ -799,6 +814,7 @@ static int HTLoadHTTP(const char *arg, msg2 = gettext("the certificate is not trusted"); } HTSprintf0(&msg, SSL_FORCED_PROMPT, msg2); +#endif CTRACE((tfp, "HTLoadHTTP: %s\n", msg)); if (!ssl_noprompt) { if (!HTForcedPrompt(ssl_noprompt, msg, YES)) { |