enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 1 Projects Releases Wiki Activity

Check for gnutls >= 2.6 

SVN revision: 53578
This commit is contained in:
Sebastian Dransfeld 2010-10-18 18:28:11 +00:00
parent 515f06978b
commit 38f1292466
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
legacy/ecore/m4/ecore_check_options.m4
View File

@ -178,6 +178,9 @@ if test "x${_ecore_want_gnutls}" = "xyes" -o "x${_ecore_want_gnutls}" = "xauto"
PKG_CHECK_MODULES([TLSTICKET], [gnutls >= 2.10.0],
[AC_DEFINE(USE_GNUTLS2_10, 1, [Use GnuTLS 2.10])],
[dummy="no"])
PKG_CHECK_MODULES([TLSSTRERROR], [gnutls >= 2.6.0],
[AC_DEFINE(USE_GNUTLS2_6, 1, [Use GnuTLS 2.6])],
[dummy="no"])
if test "x$_ecore_have_gnutls" = "xyes";then
AC_PATH_GENERIC([libgcrypt], [], [_ecore_have_gnutls="yes"], [_ecore_have_gnutls="no"])
if test "x${_ecore_have_gnutls}" = "xyes" ; then

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

@ -48,8 +48,10 @@ static int _client_connected = 0;
static void
_gnutls_print_errors(int ret)
{
#ifdef USE_GNUTLS2_6
if (ret)
ERR("gnutls returned with error: %s - %s", gnutls_strerror_name(ret), gnutls_strerror(ret));
#endif
}
@ -498,7 +500,9 @@ _ecore_con_ssl_server_init_gnutls(Ecore_Con_Server *svr)
svr->ssl_state = ECORE_CON_SSL_STATE_HANDSHAKING;
case ECORE_CON_SSL_STATE_HANDSHAKING:
ret = gnutls_handshake(svr->session);
#ifdef USE_GNUTLS2_6
DBG("calling gnutls_handshake(): returned with '%s'", gnutls_strerror_name(ret));
#endif
SSL_ERROR_CHECK_GOTO_ERROR(gnutls_error_is_fatal(ret));
if (!ret)
{