From c5b0df352e52d09dae58fa0806f37bbabf874041 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Sat, 10 Dec 2011 08:09:17 +0000 Subject: [PATCH] fix cert flag detection SVN revision: 66081 --- legacy/ecore/ChangeLog | 4 ++++ legacy/ecore/src/lib/ecore_con/ecore_con.c | 5 ++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/legacy/ecore/ChangeLog b/legacy/ecore/ChangeLog index 6ceb0544e1..f58daa75f8 100644 --- a/legacy/ecore/ChangeLog +++ b/legacy/ecore/ChangeLog @@ -390,3 +390,7 @@ * Allow SSL certificates to be loaded for STARTTLS * Added functions to set/get the hostname used for SSL certificate verification * ecore_con_ssl_server_cafile_add() now accepts directories + +2011-12-10 Mike Blumenkrantz + + * Fix case where SSL certificates would not be used diff --git a/legacy/ecore/src/lib/ecore_con/ecore_con.c b/legacy/ecore/src/lib/ecore_con/ecore_con.c index afd31a5f78..78c15e9c9b 100644 --- a/legacy/ecore/src/lib/ecore_con/ecore_con.c +++ b/legacy/ecore/src/lib/ecore_con/ecore_con.c @@ -308,8 +308,7 @@ ecore_con_server_add(Ecore_Con_Type compl_type, svr->port = port; svr->data = (void *)data; svr->created = EINA_TRUE; - if (compl_type & ECORE_CON_LOAD_CERT) - svr->use_cert = EINA_TRUE; + svr->use_cert = (compl_type & ECORE_CON_SSL & ECORE_CON_LOAD_CERT) == ECORE_CON_LOAD_CERT; svr->reject_excess_clients = EINA_FALSE; svr->client_limit = -1; svr->clients = NULL; @@ -402,7 +401,7 @@ ecore_con_server_connect(Ecore_Con_Type compl_type, svr->port = port; svr->data = (void *)data; svr->created = EINA_FALSE; - svr->use_cert = (compl_type & ECORE_CON_LOAD_CERT); + svr->use_cert = (compl_type & ECORE_CON_SSL & ECORE_CON_LOAD_CERT) == ECORE_CON_LOAD_CERT; svr->reject_excess_clients = EINA_FALSE; svr->clients = NULL; svr->client_limit = -1;