security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-08 12:44:23 +01:00
Code Activity

http: Print human readable GNUTLS status.

Browse Source 
* common/http.c (send_gnutls_bye): Take care of EAGAIN et al.
(http_verify_server_credentials): Print a human readable status.
This commit is contained in:
Werner Koch 2014-06-13 19:39:48 +02:00
parent d8314e31c5
commit 5bf04522e3
1 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
common/http.c
View File

@ -2419,8 +2419,21 @@ static void
send_gnutls_bye (void *opaque) send_gnutls_bye (void *opaque)
{ {
gnutls_session_t tls_session = opaque; gnutls_session_t tls_session = opaque;
int ret;
gnutls_bye (tls_session, GNUTLS_SHUT_RDWR); again:
do
ret = gnutls_bye (tls_session, GNUTLS_SHUT_RDWR);
while (ret == GNUTLS_E_INTERRUPTED);
if (ret == GNUTLS_E_AGAIN)
{
struct timeval tv;
tv.tv_sec = 0;
tv.tv_usec = 50000;
my_select (0, NULL, NULL, NULL, &tv);
goto again;
}
} }
#endif /*HTTP_USE_GNUTLS*/ #endif /*HTTP_USE_GNUTLS*/
@ -2486,6 +2499,19 @@ http_verify_server_credentials (http_session_t sess)
else if (status) else if (status)
{ {
log_error ("%s: status=0x%04x\n", errprefix, status); log_error ("%s: status=0x%04x\n", errprefix, status);
#if GNUTLS_VERSION_NUMBER >= 0x030104
{
gnutls_datum_t statusdat;
if (!gnutls_certificate_verification_status_print
(status, GNUTLS_CRT_X509, &statusdat, 0))
{
log_info ("%s: %s\n", errprefix, statusdat.data);
gnutls_free (statusdat.data);
}
}
#endif /*gnutls >= 3.1.4*/
sess->verify.status = status; sess->verify.status = status;
if (!err) if (!err)
err = gpg_error (GPG_ERR_GENERAL); err = gpg_error (GPG_ERR_GENERAL);