cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=a68ded6ab63deb3e7a632693840ad31473bf87f2
commit a68ded6ab63deb3e7a632693840ad31473bf87f2 Author: Cedric BAIL <[email protected]> Date: Tue Dec 30 11:18:21 2014 +0100 ecore_con: SSL error function is waiting for Eo object not their private data. --- src/lib/ecore_con/ecore_con_ssl.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/lib/ecore_con/ecore_con_ssl.c b/src/lib/ecore_con/ecore_con_ssl.c index d31b44e..3ae0560 100644 --- a/src/lib/ecore_con/ecore_con_ssl.c +++ b/src/lib/ecore_con/ecore_con_ssl.c @@ -55,7 +55,7 @@ static int _client_connected = 0; #if HAVE_GNUTLS static void -_gnutls_print_errors(void *conn, int type, int ret) +_gnutls_print_errors(Eo *conn, int type, int ret) { char buf[1024]; @@ -326,7 +326,7 @@ case (X): \ } static void -_openssl_print_errors(void *conn, int type) +_openssl_print_errors(Eo *conn, int type) { char buf[1024]; do @@ -938,7 +938,7 @@ _ecore_con_ssl_server_prepare_gnutls(Ecore_Con_Server *obj, return ECORE_CON_SSL_ERROR_NONE; error: - _gnutls_print_errors(svr, ECORE_CON_EVENT_SERVER_ERROR, ret); + _gnutls_print_errors(obj, ECORE_CON_EVENT_SERVER_ERROR, ret); _ecore_con_ssl_server_shutdown_gnutls(obj); return ECORE_CON_SSL_ERROR_SERVER_INIT_FAILED; } @@ -1065,7 +1065,7 @@ _ecore_con_ssl_server_init_gnutls(Ecore_Con_Server *obj) return ECORE_CON_SSL_ERROR_NONE; error: - _gnutls_print_errors(svr, ECORE_CON_EVENT_SERVER_ERROR, ret); + _gnutls_print_errors(obj, ECORE_CON_EVENT_SERVER_ERROR, ret); if ((ret == GNUTLS_E_WARNING_ALERT_RECEIVED) || (ret == GNUTLS_E_FATAL_ALERT_RECEIVED)) ERR("Also received alert: %s", gnutls_alert_get_name(gnutls_alert_get(svr->session))); if (svr->session && (svr->ssl_state != ECORE_CON_SSL_STATE_DONE)) @@ -1399,7 +1399,7 @@ _ecore_con_ssl_client_init_gnutls(Ecore_Con_Client *obj) return ECORE_CON_SSL_ERROR_NONE; error: - _gnutls_print_errors(cl, ECORE_CON_EVENT_CLIENT_ERROR, ret); + _gnutls_print_errors(obj, ECORE_CON_EVENT_CLIENT_ERROR, ret); if ((ret == GNUTLS_E_WARNING_ALERT_RECEIVED) || (ret == GNUTLS_E_FATAL_ALERT_RECEIVED)) ERR("Also received alert: %s", gnutls_alert_get_name(gnutls_alert_get(cl->session))); if (cl->session && (cl->ssl_state != ECORE_CON_SSL_STATE_DONE)) @@ -1599,7 +1599,7 @@ error: ERR("openssl error: dh_params could not generate a safe prime!"); } else - _openssl_print_errors(svr, ECORE_CON_EVENT_SERVER_ERROR); + _openssl_print_errors(obj, ECORE_CON_EVENT_SERVER_ERROR); _ecore_con_ssl_server_shutdown_openssl(obj); return ECORE_CON_SSL_ERROR_SERVER_INIT_FAILED; } @@ -1693,7 +1693,7 @@ _ecore_con_ssl_server_init_openssl(Ecore_Con_Server *obj) return ECORE_CON_SSL_ERROR_NONE; error: - _openssl_print_errors(svr, ECORE_CON_EVENT_SERVER_ERROR); + _openssl_print_errors(obj, ECORE_CON_EVENT_SERVER_ERROR); _ecore_con_ssl_server_shutdown_openssl(obj); return ECORE_CON_SSL_ERROR_SERVER_INIT_FAILED; } @@ -1713,7 +1713,7 @@ _ecore_con_ssl_server_cafile_add_openssl(Ecore_Con_Server *obj, return EINA_TRUE; error: - _openssl_print_errors(svr, ECORE_CON_EVENT_SERVER_ERROR); + _openssl_print_errors(obj, ECORE_CON_EVENT_SERVER_ERROR); return EINA_FALSE; } @@ -1738,7 +1738,7 @@ _ecore_con_ssl_server_crl_add_openssl(Ecore_Con_Server *obj, return EINA_TRUE; error: - _openssl_print_errors(svr, ECORE_CON_EVENT_SERVER_ERROR); + _openssl_print_errors(obj, ECORE_CON_EVENT_SERVER_ERROR); return EINA_FALSE; } @@ -1765,7 +1765,7 @@ _ecore_con_ssl_server_privkey_add_openssl(Ecore_Con_Server *obj, error: if (fp) fclose(fp); - _openssl_print_errors(svr, ECORE_CON_EVENT_SERVER_ERROR); + _openssl_print_errors(obj, ECORE_CON_EVENT_SERVER_ERROR); return EINA_FALSE; } @@ -1791,7 +1791,7 @@ _ecore_con_ssl_server_cert_add_openssl(Ecore_Con_Server *obj, error: if (fp) fclose(fp); - _openssl_print_errors(svr, ECORE_CON_EVENT_SERVER_ERROR); + _openssl_print_errors(obj, ECORE_CON_EVENT_SERVER_ERROR); return EINA_FALSE; } @@ -1941,7 +1941,7 @@ _ecore_con_ssl_client_init_openssl(Ecore_Con_Client *obj) return ECORE_CON_SSL_ERROR_NONE; error: - _openssl_print_errors(cl, ECORE_CON_EVENT_CLIENT_ERROR); + _openssl_print_errors(obj, ECORE_CON_EVENT_CLIENT_ERROR); _ecore_con_ssl_client_shutdown_openssl(obj); return ECORE_CON_SSL_ERROR_SERVER_INIT_FAILED; } --
