From ad6f95f146c7954788b658017550cebe2d3240bb Mon Sep 17 00:00:00 2001 From: englebass Date: Mon, 18 Oct 2010 18:28:11 +0000 Subject: [PATCH] Check for gnutls >= 2.6 git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/ecore@53578 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- m4/ecore_check_options.m4 | 3 +++ src/lib/ecore_con/ecore_con_ssl.c | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/m4/ecore_check_options.m4 b/m4/ecore_check_options.m4 index 2d6ab0b..ce2840c 100644 --- a/m4/ecore_check_options.m4 +++ b/m4/ecore_check_options.m4 @@ -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 diff --git a/src/lib/ecore_con/ecore_con_ssl.c b/src/lib/ecore_con/ecore_con_ssl.c index 473e1ce..7914690 100644 --- a/src/lib/ecore_con/ecore_con_ssl.c +++ b/src/lib/ecore_con/ecore_con_ssl.c @@ -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) { -- 2.7.4