From c14ede1a733e3ba51405034653f0e62a05419a1d Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 6 Sep 2012 08:03:41 +0000 Subject: [PATCH] apparently when using openssl, the prepared flag was never being set for servers SVN revision: 76228 --- legacy/ecore/ChangeLog | 1 + legacy/ecore/src/lib/ecore_con/ecore_con_ssl.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/legacy/ecore/ChangeLog b/legacy/ecore/ChangeLog index 8dcfc12697..ce6abdf4b4 100644 --- a/legacy/ecore/ChangeLog +++ b/legacy/ecore/ChangeLog @@ -913,3 +913,4 @@ 2012-09-06 Mike Blumenkrantz * Fix race condition in ecore-con where events could sometimes be sent for freed clients + * Fix ssl servers using openssl diff --git a/legacy/ecore/src/lib/ecore_con/ecore_con_ssl.c b/legacy/ecore/src/lib/ecore_con/ecore_con_ssl.c index c2e4092e57..1027dbb118 100644 --- a/legacy/ecore/src/lib/ecore_con/ecore_con_ssl.c +++ b/legacy/ecore/src/lib/ecore_con/ecore_con_ssl.c @@ -1557,6 +1557,7 @@ _ecore_con_ssl_server_prepare_openssl(Ecore_Con_Server *svr, break; default: + svr->ssl_prepared = EINA_TRUE; return ECORE_CON_SSL_ERROR_NONE; } @@ -1577,6 +1578,7 @@ _ecore_con_ssl_server_prepare_openssl(Ecore_Con_Server *svr, else if (!svr->use_cert) SSL_ERROR_CHECK_GOTO_ERROR(!SSL_CTX_set_cipher_list(svr->ssl_ctx, "aNULL:!eNULL:!LOW:!EXPORT:!ECDH:RSA:AES:!PSK:@STRENGTH")); + svr->ssl_prepared = EINA_TRUE; return ECORE_CON_SSL_ERROR_NONE; error: