forked from enlightenment/efl
apparently when using openssl, the prepared flag was never being set for servers
SVN revision: 76228
This commit is contained in:
parent
bf8f20a3f6
commit
c14ede1a73
|
@ -913,3 +913,4 @@
|
||||||
2012-09-06 Mike Blumenkrantz
|
2012-09-06 Mike Blumenkrantz
|
||||||
|
|
||||||
* Fix race condition in ecore-con where events could sometimes be sent for freed clients
|
* Fix race condition in ecore-con where events could sometimes be sent for freed clients
|
||||||
|
* Fix ssl servers using openssl
|
||||||
|
|
|
@ -1557,6 +1557,7 @@ _ecore_con_ssl_server_prepare_openssl(Ecore_Con_Server *svr,
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
|
svr->ssl_prepared = EINA_TRUE;
|
||||||
return ECORE_CON_SSL_ERROR_NONE;
|
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)
|
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"));
|
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;
|
return ECORE_CON_SSL_ERROR_NONE;
|
||||||
|
|
||||||
error:
|
error:
|
||||||
|
|
Loading…
Reference in New Issue