MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-07-28 21:38:39 +02:00
Code Issues Releases Wiki Activity

gnutls: Fix ssld crash when executing a SSL connection to another server.

Browse source
This commit is contained in:
Keith Buck 2012-04-07 17:40:22 +00:00
parent e0550bba26
commit 3d7890b99c
1 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
libratbox/src/gnutls.c
View file

@ -76,7 +76,7 @@ rb_ssl_timeout(rb_fde_t *F, void *notused)
static int static int
do_ssl_handshake(rb_fde_t *F, PF * callback) do_ssl_handshake(rb_fde_t *F, PF * callback, void *data)
{ {
int ret; int ret;
int flags; int flags;
@ -90,7 +90,7 @@ do_ssl_handshake(rb_fde_t *F, PF * callback)
flags = RB_SELECT_READ; flags = RB_SELECT_READ;
else else
flags = RB_SELECT_WRITE; flags = RB_SELECT_WRITE;
rb_setselect(F, flags, callback, NULL); rb_setselect(F, flags, callback, data);
return 0; return 0;
} }
F->ssl_errno = ret; F->ssl_errno = ret;
@ -107,7 +107,7 @@ rb_ssl_tryaccept(rb_fde_t *F, void *data)
lrb_assert(F->accept != NULL); lrb_assert(F->accept != NULL);
ret = do_ssl_handshake(F, rb_ssl_tryaccept); ret = do_ssl_handshake(F, rb_ssl_tryaccept, NULL);
/* do_ssl_handshake does the rb_setselect */ /* do_ssl_handshake does the rb_setselect */
if(ret == 0) if(ret == 0)
@ -146,7 +146,7 @@ rb_ssl_start_accepted(rb_fde_t *new_F, ACCB * cb, void *data, int timeout)
gnutls_dh_set_prime_bits(*ssl, 1024); gnutls_dh_set_prime_bits(*ssl, 1024);
gnutls_transport_set_ptr(*ssl, (gnutls_transport_ptr_t) (long int)new_F->fd); gnutls_transport_set_ptr(*ssl, (gnutls_transport_ptr_t) (long int)new_F->fd);
gnutls_certificate_server_set_request(*ssl, GNUTLS_CERT_REQUEST); gnutls_certificate_server_set_request(*ssl, GNUTLS_CERT_REQUEST);
if(do_ssl_handshake(new_F, rb_ssl_tryaccept)) if(do_ssl_handshake(new_F, rb_ssl_tryaccept, NULL))
{ {
struct acceptdata *ad = new_F->accept; struct acceptdata *ad = new_F->accept;
new_F->accept = NULL; new_F->accept = NULL;
@ -178,7 +178,7 @@ rb_ssl_accept_setup(rb_fde_t *F, rb_fde_t *new_F, struct sockaddr *st, int addrl
gnutls_dh_set_prime_bits(SSL_P(new_F), 1024); gnutls_dh_set_prime_bits(SSL_P(new_F), 1024);
gnutls_transport_set_ptr(SSL_P(new_F), (gnutls_transport_ptr_t) (long int)rb_get_fd(new_F)); gnutls_transport_set_ptr(SSL_P(new_F), (gnutls_transport_ptr_t) (long int)rb_get_fd(new_F));
gnutls_certificate_server_set_request(SSL_P(new_F), GNUTLS_CERT_REQUEST); gnutls_certificate_server_set_request(SSL_P(new_F), GNUTLS_CERT_REQUEST);
if(do_ssl_handshake(F, rb_ssl_tryaccept)) if(do_ssl_handshake(F, rb_ssl_tryaccept, NULL))
{ {
struct acceptdata *ad = F->accept; struct acceptdata *ad = F->accept;
F->accept = NULL; F->accept = NULL;
@ -386,7 +386,7 @@ rb_ssl_tryconn_cb(rb_fde_t *F, void *data)
struct ssl_connect *sconn = data; struct ssl_connect *sconn = data;
int ret; int ret;
ret = do_ssl_handshake(F, rb_ssl_tryconn_cb); ret = do_ssl_handshake(F, rb_ssl_tryconn_cb, (void *)sconn);
switch (ret) switch (ret)
{ {
@ -425,10 +425,7 @@ rb_ssl_tryconn(rb_fde_t *F, int status, void *data)
gnutls_dh_set_prime_bits(SSL_P(F), 1024); gnutls_dh_set_prime_bits(SSL_P(F), 1024);
gnutls_transport_set_ptr(SSL_P(F), (gnutls_transport_ptr_t) (long int)F->fd); gnutls_transport_set_ptr(SSL_P(F), (gnutls_transport_ptr_t) (long int)F->fd);
if(do_ssl_handshake(F, rb_ssl_tryconn_cb)) do_ssl_handshake(F, rb_ssl_tryconn_cb, (void *)sconn);
{
rb_ssl_connect_realcb(F, RB_OK, sconn);
}
} }
void void
@ -472,10 +469,7 @@ rb_ssl_start_connected(rb_fde_t *F, CNCB * callback, void *data, int timeout)
rb_settimeout(F, sconn->timeout, rb_ssl_tryconn_timeout_cb, sconn); rb_settimeout(F, sconn->timeout, rb_ssl_tryconn_timeout_cb, sconn);
if(do_ssl_handshake(F, rb_ssl_tryconn_cb)) do_ssl_handshake(F, rb_ssl_tryconn_cb, (void *)sconn);
{
rb_ssl_connect_realcb(F, RB_OK, sconn);
}
} }
int int