dimmus
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

finally crush the last openssl segv 

still broken though


SVN revision: 52467
This commit is contained in:
Mike Blumenkrantz 2010-09-19 18:40:43 +00:00
parent 0f4ce94ecf
commit 0c4707dcbc
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
legacy/ecore/src/lib/ecore_con/ecore_con_ssl.c
View File

@ -812,12 +812,8 @@ _ecore_con_ssl_server_init_openssl(Ecore_Con_Server *svr)
return ECORE_CON_SSL_ERROR_NONE;
error:
if (svr->ssl)
SSL_free(svr->ssl);
if (svr->ssl_ctx)
SSL_CTX_free(svr->ssl_ctx);
ERR("openssl error: %s", ERR_reason_error_string(ERR_get_error()));
_ecore_con_ssl_server_shutdown_openssl(svr);
return ECORE_CON_SSL_ERROR_SERVER_INIT_FAILED;
}
@ -998,15 +994,13 @@ _ecore_con_ssl_client_init_openssl(Ecore_Con_Client *cl)
SSL_set_accept_state(cl->ssl);
SSL_ERROR_CHECK_GOTO_ERROR(!SSL_set_fd(cl->ssl, cl->fd));
SSL_ERROR_CHECK_GOTO_ERROR(SSL_do_handshake(cl->ssl) < 1);
SSL_ERROR_CHECK_GOTO_ERROR(SSL_accept(cl->ssl) < 1);
return ECORE_CON_SSL_ERROR_NONE;
error:
if (cl->ssl)
SSL_free(cl->ssl);
ERR("openssl error: %s", ERR_reason_error_string(ERR_get_error()));
_ecore_con_ssl_client_shutdown_openssl(cl);
return ECORE_CON_SSL_ERROR_SERVER_INIT_FAILED;
}