Enlightenment CVS committal Author : sebastid Project : e17 Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_con Modified Files: ecore_con.c Log Message: Delay initialization of SSL. =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_con/ecore_con.c,v retrieving revision 1.47 retrieving revision 1.48 diff -u -3 -r1.47 -r1.48 --- ecore_con.c 24 Aug 2005 09:11:30 -0000 1.47 +++ ecore_con.c 24 Aug 2005 16:29:06 -0000 1.48 @@ -445,23 +445,9 @@ ecore_con_dns_lookup(name, _ecore_con_cb_dns_lookup, svr); } -#if USE_OPENSSL - if (compl_type & ECORE_CON_USE_SSL) - { - /* SSLv3 gives *weird* results on my box, don't use it yet */ - if (!(svr->ssl_ctx = SSL_CTX_new(SSLv2_client_method()))) - goto error; - - if (!(svr->ssl = SSL_new(svr->ssl_ctx))) - goto error; - - SSL_set_fd(svr->ssl, svr->fd); - } -#endif - svr->name = strdup(name); if (!svr->name) goto error; - svr->type = type; + svr->type = compl_type; svr->port = port; svr->data = (void *)data; svr->created = 0; @@ -935,6 +921,20 @@ if (!svr->fd_handler) goto error; +#if USE_OPENSSL + if (svr->type & ECORE_CON_USE_SSL) + { + /* SSLv3 gives *weird* results on my box, don't use it yet */ + if (!(svr->ssl_ctx = SSL_CTX_new(SSLv2_client_method()))) + goto error; + + if (!(svr->ssl = SSL_new(svr->ssl_ctx))) + goto error; + + SSL_set_fd(svr->ssl, svr->fd); + } +#endif + return; error: ------------------------------------------------------- SF.Net email is Sponsored by the Better Software Conference & EXPO September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs