backport previous commit

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/branches/ecore-1.7@76229 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/ChangeLog b/ChangeLog
index 0db95d8..2ca4aae 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -895,3 +895,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/src/lib/ecore_con/ecore_con_ssl.c b/src/lib/ecore_con/ecore_con_ssl.c
index c2e4092..1027dbb 100644 (file)
--- a/src/lib/ecore_con/ecore_con_ssl.c
+++ b/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: