From cd35ab46afe1fed644225d74ef2d8c12ac75837d Mon Sep 17 00:00:00 2001 From: mom040267 Date: Thu, 11 Dec 2014 09:02:49 +0000 Subject: [PATCH] tls code cleaning --- src/apps/relay/dtls_listener.c | 7 ++++-- src/apps/relay/netengine.c | 30 +++++++++++++------------- src/apps/relay/ns_ioalib_engine_impl.c | 8 +++---- src/apps/relay/ns_ioalib_impl.h | 8 +++---- 4 files changed, 28 insertions(+), 25 deletions(-) diff --git a/src/apps/relay/dtls_listener.c b/src/apps/relay/dtls_listener.c index f45e4bbf..9119535a 100644 --- a/src/apps/relay/dtls_listener.c +++ b/src/apps/relay/dtls_listener.c @@ -898,7 +898,10 @@ static int init_server(dtls_listener_relay_server_type* server, if(!server) return -1; +#if DTLSv1_SUPPORTED server->dtls_ctx = e->dtls_ctx; +#endif + #if DTLSv1_2_SUPPORTED server->dtls_ctx_v1_2 = e->dtls_ctx_v1_2; #endif @@ -918,6 +921,7 @@ static int init_server(dtls_listener_relay_server_type* server, server->e = e; +#if DTLSv1_SUPPORTED if(server->dtls_ctx) { #if defined(REQUEST_CLIENT_CERT) @@ -927,11 +931,10 @@ static int init_server(dtls_listener_relay_server_type* server, SSL_CTX_set_read_ahead(server->dtls_ctx, 1); -#if DTLSv1_SUPPORTED SSL_CTX_set_cookie_generate_cb(server->dtls_ctx, generate_cookie); SSL_CTX_set_cookie_verify_cb(server->dtls_ctx, verify_cookie); -#endif } +#endif #if DTLSv1_2_SUPPORTED if(server->dtls_ctx_v1_2) { diff --git a/src/apps/relay/netengine.c b/src/apps/relay/netengine.c index 02880373..633984b0 100644 --- a/src/apps/relay/netengine.c +++ b/src/apps/relay/netengine.c @@ -940,18 +940,18 @@ static ioa_engine_handle create_new_listener_engine(void) ,turn_params.redis_statsdb #endif ); - set_ssl_ctx(e, turn_params.tls_ctx_ssl23, turn_params.tls_ctx_v1_0, + set_ssl_ctx(e, turn_params.tls_ctx_ssl23, turn_params.tls_ctx_v1_0 #if TLSv1_1_SUPPORTED - turn_params.tls_ctx_v1_1, + ,turn_params.tls_ctx_v1_1 #if TLSv1_2_SUPPORTED - turn_params.tls_ctx_v1_2, + ,turn_params.tls_ctx_v1_2 #endif #endif #if DTLSv1_SUPPORTED - turn_params.dtls_ctx + ,turn_params.dtls_ctx #endif #if DTLSv1_2_SUPPORTED - ,turn_params.dtls_ctx_v1_2 + ,turn_params.dtls_ctx_v1_2 #endif ); ioa_engine_set_rtcp_map(e, turn_params.listener.rtcpmap); @@ -996,18 +996,18 @@ static void setup_listener(void) if(!turn_params.listener.ioa_eng) exit(-1); - set_ssl_ctx(turn_params.listener.ioa_eng, turn_params.tls_ctx_ssl23, turn_params.tls_ctx_v1_0, + set_ssl_ctx(turn_params.listener.ioa_eng, turn_params.tls_ctx_ssl23, turn_params.tls_ctx_v1_0 #if TLSv1_1_SUPPORTED - turn_params.tls_ctx_v1_1, + ,turn_params.tls_ctx_v1_1 #if TLSv1_2_SUPPORTED - turn_params.tls_ctx_v1_2, + ,turn_params.tls_ctx_v1_2 #endif #endif #if DTLSv1_SUPPORTED - turn_params.dtls_ctx + ,turn_params.dtls_ctx #endif #if DTLSv1_2_SUPPORTED - ,turn_params.dtls_ctx_v1_2 + ,turn_params.dtls_ctx_v1_2 #endif ); @@ -1570,18 +1570,18 @@ static void setup_relay_server(struct relay_server *rs, ioa_engine_handle e, int ,turn_params.redis_statsdb #endif ); - set_ssl_ctx(rs->ioa_eng, turn_params.tls_ctx_ssl23, turn_params.tls_ctx_v1_0, + set_ssl_ctx(rs->ioa_eng, turn_params.tls_ctx_ssl23, turn_params.tls_ctx_v1_0 #if TLSv1_1_SUPPORTED - turn_params.tls_ctx_v1_1, + ,turn_params.tls_ctx_v1_1 #if TLSv1_2_SUPPORTED - turn_params.tls_ctx_v1_2, + ,turn_params.tls_ctx_v1_2 #endif #endif #if DTLSv1_SUPPORTED - turn_params.dtls_ctx + ,turn_params.dtls_ctx #endif #if DTLSv1_2_SUPPORTED - ,turn_params.dtls_ctx_v1_2 + ,turn_params.dtls_ctx_v1_2 #endif ); ioa_engine_set_rtcp_map(rs->ioa_eng, turn_params.listener.rtcpmap); diff --git a/src/apps/relay/ns_ioalib_engine_impl.c b/src/apps/relay/ns_ioalib_engine_impl.c index 5fcc8b86..3feb6b6e 100644 --- a/src/apps/relay/ns_ioalib_engine_impl.c +++ b/src/apps/relay/ns_ioalib_engine_impl.c @@ -433,15 +433,15 @@ ioa_engine_handle create_ioa_engine(super_memory_t *sm, void set_ssl_ctx(ioa_engine_handle e, SSL_CTX *tls_ctx_ssl23, - SSL_CTX *tls_ctx_v1_0, + SSL_CTX *tls_ctx_v1_0 #if TLSv1_1_SUPPORTED - SSL_CTX *tls_ctx_v1_1, + ,SSL_CTX *tls_ctx_v1_1 #if TLSv1_2_SUPPORTED - SSL_CTX *tls_ctx_v1_2, + ,SSL_CTX *tls_ctx_v1_2 #endif #endif #if DTLSv1_SUPPORTED - SSL_CTX *dtls_ctx + ,SSL_CTX *dtls_ctx #endif #if DTLSv1_2_SUPPORTED ,SSL_CTX *dtls_ctx_v1_2 diff --git a/src/apps/relay/ns_ioalib_impl.h b/src/apps/relay/ns_ioalib_impl.h index 989cefbb..5e82e0d9 100644 --- a/src/apps/relay/ns_ioalib_impl.h +++ b/src/apps/relay/ns_ioalib_impl.h @@ -255,15 +255,15 @@ ioa_engine_handle create_ioa_engine(super_memory_t *sm, void set_ssl_ctx(ioa_engine_handle e, SSL_CTX *tls_ctx_ssl23, - SSL_CTX *tls_ctx_v1_0, + SSL_CTX *tls_ctx_v1_0 #if TLSv1_1_SUPPORTED - SSL_CTX *tls_ctx_v1_1, + ,SSL_CTX *tls_ctx_v1_1 #if TLSv1_2_SUPPORTED - SSL_CTX *tls_ctx_v1_2, + ,SSL_CTX *tls_ctx_v1_2 #endif #endif #if DTLSv1_SUPPORTED - SSL_CTX *dtls_ctx + ,SSL_CTX *dtls_ctx #endif #if DTLSv1_2_SUPPORTED ,SSL_CTX *dtls_ctx_v1_2