Skip to content

tls-gnutls.c: Handle rehandshake error in _httpTLSRead #1508

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zdohnal wants to merge 2 commits into
base: master
Choose a base branch
from
Open

tls-gnutls.c: Handle rehandshake error in _httpTLSRead #1508

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
56d1242
tls-gnutls.c: Do not check for errno after I/O operations
zdohnal Mar 5, 2026
eebaba1
tls-gnutls.c: Handle rehandshake error in `_httpTLSRead`
zdohnal Mar 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 44 additions & 34 deletions cups/tls-gnutls.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1613,25 +1613,37 @@ _httpTLSRead(http_t *http, // I - Connection to server

result = gnutls_record_recv(http->tls, buf, (size_t)len);

if (result < 0 && !errno)
if (result >= 0)
return (result);

// Convert GNU TLS error to errno value...
switch (result)
{
// Convert GNU TLS error to errno value...
switch (result)
{
case GNUTLS_E_INTERRUPTED :
errno = EINTR;
break;
case GNUTLS_E_INTERRUPTED :
errno = EINTR;
break;

case GNUTLS_E_AGAIN :
errno = EAGAIN;
break;
case GNUTLS_E_AGAIN :
errno = EAGAIN;
break;

default :
errno = EPIPE;
break;
}
case GNUTLS_E_REHANDSHAKE :
// if used in client, ignore the error
if (http->mode == _HTTP_MODE_CLIENT)
{
errno = 0;
result = 0;
}
else
{
// terminate the session as server
errno = EPIPE;
}
break;

result = -1;
default :
errno = EPIPE;
break;
}

return ((int)result);
Expand Down Expand Up @@ -2022,30 +2034,28 @@ _httpTLSWrite(http_t *http, // I - Connection to server

result = gnutls_record_send(http->tls, buf, (size_t)len);

if (result < 0 && !errno)
{
// Convert GNU TLS error to errno value...
switch (result)
{
case GNUTLS_E_INTERRUPTED :
errno = EINTR;
break;
DEBUG_printf("5_httpTLSWrite: gnutls_record_send returns %d.", (int)result);

case GNUTLS_E_AGAIN :
errno = EAGAIN;
break;
if (result >= 0)
return (result);

default :
errno = EPIPE;
break;
}
// Convert GNU TLS error to errno value...
switch (result)
{
case GNUTLS_E_INTERRUPTED :
errno = EINTR;
break;

result = -1;
}
case GNUTLS_E_AGAIN :
errno = EAGAIN;
break;

DEBUG_printf("5_httpTLSWrite: Returning %d.", (int)result);
default :
errno = EPIPE;
break;
}

return ((int)result);
return (-1);
}


Expand Down
Loading