From 061f49560b6c5855f2a5d1700a4f871193bd1adc Mon Sep 17 00:00:00 2001 From: mom040267 Date: Sun, 26 Oct 2014 04:31:21 +0000 Subject: [PATCH] ssl renegotiation callback fixed --- ChangeLog | 2 +- src/apps/relay/ns_ioalib_engine_impl.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 05c32ecf..5ce8b345 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,9 @@ 10/16/2014 Oleg Moskalenko Version 4.2.1.4 'Monza': - - Code cleaning. - TCP/TLS tests extended. - relay RTCP sockets ports allocation fixed. - list of libraries cleaned. + - SSL renegotiation callback fixed. 10/05/2014 Oleg Moskalenko Version 4.2.1.2 'Monza': diff --git a/src/apps/relay/ns_ioalib_engine_impl.c b/src/apps/relay/ns_ioalib_engine_impl.c index e66df80f..aa825d2a 100644 --- a/src/apps/relay/ns_ioalib_engine_impl.c +++ b/src/apps/relay/ns_ioalib_engine_impl.c @@ -1739,7 +1739,9 @@ ioa_socket_handle detach_ioa_socket(ioa_socket_handle s) ret->realm_hash = s->realm_hash; - set_socket_ssl(ret,s->ssl); + SSL* ssl = s->ssl; + set_socket_ssl(s,NULL); + set_socket_ssl(ret,ssl); ret->fd = s->fd; ret->family = get_ioa_socket_address_family(s); @@ -1770,7 +1772,6 @@ ioa_socket_handle detach_ioa_socket(ioa_socket_handle s) ret->current_tos = s->current_tos; ret->default_tos = s->default_tos; - set_socket_ssl(s,NULL); s->fd = -1; }