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

GNUTLS: Improve rb_ssl_accept_common()

Browse source 
* Add more debugging assertions

* Cancel timeouts and callbacks when handshake succeeds or hard fails

* Differentiate between kernel and library errors

* Increase F->handshake_count on handshake success

  I'm still not exactly sure what this is even used for. It may be
  removed from all backends at a later time if I find it's not being
  used for anything important, as right now it can only have the values
  0 or 1.
This commit is contained in:
Aaron Jones 2016-09-16 21:45:19 +00:00
parent 8099d352c9
commit 8ebebff4b4
No known key found for this signature in database
GPG key ID: EC6F86EE9CD840B5
1 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
libratbox/src/gnutls.c
View file

@ -219,29 +219,46 @@ rb_ssl_timeout_cb(rb_fde_t *F, void *notused)
static void static void
rb_ssl_accept_common(rb_fde_t *F, void *data) rb_ssl_accept_common(rb_fde_t *F, void *data)
{ {
lrb_assert(F != NULL);
lrb_assert(F->accept != NULL); lrb_assert(F->accept != NULL);
lrb_assert(F->accept->callback != NULL); lrb_assert(F->accept->callback != NULL);
lrb_assert(F->ssl != NULL);
errno = 0; errno = 0;
int ret = gnutls_handshake(SSL_P(F)); int ret = gnutls_handshake(SSL_P(F));
int err = errno;
if(ret == GNUTLS_E_AGAIN || (ret == GNUTLS_E_INTERRUPTED && (errno == 0 || rb_ignore_errno(errno)))) if(ret == GNUTLS_E_AGAIN || (ret == GNUTLS_E_INTERRUPTED && (err == 0 || rb_ignore_errno(err))))
{ {
unsigned int flags = (gnutls_record_get_direction(SSL_P(F)) == 0) ? RB_SELECT_READ : RB_SELECT_WRITE; unsigned int flags = (gnutls_record_get_direction(SSL_P(F)) == 0) ? RB_SELECT_READ : RB_SELECT_WRITE;
rb_setselect(F, flags, rb_ssl_accept_common, data); rb_setselect(F, flags, rb_ssl_accept_common, data);
return; return;
} }
struct acceptdata *const ad = F->accept; // These 2 calls may affect errno, which is why we save it above and restore it below
rb_settimeout(F, 0, NULL, NULL);
rb_setselect(F, RB_SELECT_READ | RB_SELECT_WRITE, NULL, NULL);
struct acceptdata *const ad = F->accept;
F->accept = NULL; F->accept = NULL;
F->ssl_errno = (unsigned long) -ret;
if(ret == GNUTLS_E_SUCCESS) if(ret == GNUTLS_E_SUCCESS)
{
F->handshake_count++;
ad->callback(F, RB_OK, (struct sockaddr *)&ad->S, ad->addrlen, ad->data); ad->callback(F, RB_OK, (struct sockaddr *)&ad->S, ad->addrlen, ad->data);
}
else if(err != 0)
{
errno = err;
ad->callback(F, RB_ERROR, NULL, 0, ad->data);
}
else else
{
errno = EIO;
F->ssl_errno = (unsigned long) -ret;
ad->callback(F, RB_ERROR_SSL, NULL, 0, ad->data); ad->callback(F, RB_ERROR_SSL, NULL, 0, ad->data);
}
rb_free(ad); rb_free(ad);
} }