backport previous ssl commit

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

diff --git a/ChangeLog b/ChangeLog
index e80701c..b2a0b5d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -888,3 +888,6 @@
 
         * Add Copy-N-Paste support for Ecore_Wayland.
 
+2012-09-05  Mike Blumenkrantz
+
+       * Fix crash that could occur in ecore_con_ssl with privkeys and certificates on failure

diff --git a/src/lib/ecore_con/ecore_con_ssl.c b/src/lib/ecore_con/ecore_con_ssl.c
index fd4c9dd..c2e4092 100644 (file)
--- a/src/lib/ecore_con/ecore_con_ssl.c
+++ b/src/lib/ecore_con/ecore_con_ssl.c
@@ -1741,6 +1741,7 @@ _ecore_con_ssl_server_privkey_add_openssl(Ecore_Con_Server *svr,
    SSL_ERROR_CHECK_GOTO_ERROR(!(privkey = PEM_read_PrivateKey(fp, NULL, NULL, NULL)));
 
    fclose(fp);
+   fp = NULL;
    SSL_ERROR_CHECK_GOTO_ERROR(SSL_CTX_use_PrivateKey(svr->ssl_ctx, privkey) < 1);
    SSL_ERROR_CHECK_GOTO_ERROR(SSL_CTX_check_private_key(svr->ssl_ctx) < 1);
 
@@ -1766,7 +1767,7 @@ _ecore_con_ssl_server_cert_add_openssl(Ecore_Con_Server *svr,
    SSL_ERROR_CHECK_GOTO_ERROR(!(cert = PEM_read_X509(fp, NULL, NULL, NULL)));
 
    fclose(fp);
-
+   fp = NULL;
    SSL_ERROR_CHECK_GOTO_ERROR(SSL_CTX_use_certificate(svr->ssl_ctx, cert) < 1);
 
    return EINA_TRUE;