9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GNUTLS: Store error codes properly

Browse source 
This is similar to commit db12df5c16 for
the MbedTLS backend.

The difference is, GNUTLS will not accept positive values as input to
gnutls_strerror(), so we invert the sign bit after retrieving the value
too, not just when storing it.

Also add a forgotten ssl_errno assignment to rb_ssl_connect_common().
This commit is contained in:
Aaron Jones 2016-09-16 20:40:23 +00:00
parent c6600fe290
commit 8099d352c9
No known key found for this signature in database
GPG key ID: EC6F86EE9CD840B5
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libratbox/src/gnutls.c
View file

@ -308,7 +308,7 @@ rb_ssl_read_or_write(int r_or_w, rb_fde_t *F, void *rbuf, const void *wbuf, size
break; break;
} }
default: default:
F->ssl_errno = ret; F->ssl_errno = (unsigned long) -ret;
errno = EIO; errno = EIO;
return RB_RW_IO_ERROR; return RB_RW_IO_ERROR;
} }
@ -606,6 +606,8 @@ rb_ssl_connect_common(rb_fde_t *const F, void *const data)
struct ssl_connect *const sconn = data; struct ssl_connect *const sconn = data;
F->ssl_errno = (unsigned long) -ret;
if(ret == GNUTLS_E_SUCCESS) if(ret == GNUTLS_E_SUCCESS)
rb_ssl_connect_realcb(F, RB_OK, sconn); rb_ssl_connect_realcb(F, RB_OK, sconn);
else else
@ -690,7 +692,8 @@ rb_get_random(void *buf, size_t length)
const char * const char *
rb_get_ssl_strerror(rb_fde_t *F) rb_get_ssl_strerror(rb_fde_t *F)
{ {
return rb_ssl_strerror(F->ssl_errno); int err = (int) F->ssl_errno;
return rb_ssl_strerror(-err);
} }
int int