vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Sun Apr 14 15:53:17 2019 +0300| [25de1bd308af2703df04e34d6b672763ec0a5871] | committer: Rémi Denis-Courmont
gnutls: require version 3.5.0+ > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=25de1bd308af2703df04e34d6b672763ec0a5871 --- configure.ac | 2 +- modules/misc/gnutls.c | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index 85f2916f05..a86a9f8897 100644 --- a/configure.ac +++ b/configure.ac @@ -4285,7 +4285,7 @@ dnl AC_ARG_ENABLE([gnutls], AS_HELP_STRING([--enable-gnutls], [GNU TLS TLS/SSL support (default enabled)])) AS_IF([test "${enable_gnutls}" != "no"], [ - PKG_CHECK_MODULES(GNUTLS, [gnutls >= 3.3.6], [ + PKG_CHECK_MODULES(GNUTLS, [gnutls >= 3.5.0], [ VLC_ADD_PLUGIN([gnutls]) ], [ AS_IF([test -n "${enable_gnutls}"], [ diff --git a/modules/misc/gnutls.c b/modules/misc/gnutls.c index def0727a17..8466000274 100644 --- a/modules/misc/gnutls.c +++ b/modules/misc/gnutls.c @@ -233,10 +233,7 @@ static vlc_tls_gnutls_t *gnutls_SessionOpen(vlc_object_t *obj, int type, const char *errp; int val; - type |= GNUTLS_NONBLOCK; -#if (GNUTLS_VERSION_NUMBER >= 0x030500) - type |= GNUTLS_ENABLE_FALSE_START; -#endif + type |= GNUTLS_NONBLOCK | GNUTLS_ENABLE_FALSE_START; val = gnutls_init(&session, type); if (val != 0) @@ -344,8 +341,6 @@ static int gnutls_Handshake(vlc_tls_t *tls, char **restrict alp) } msg_Dbg(obj, "TLS handshake complete"); -#if (GNUTLS_VERSION_NUMBER >= 0x030500) - /* intentionally left blank */; unsigned flags = gnutls_session_get_flags(session); @@ -357,7 +352,6 @@ static int gnutls_Handshake(vlc_tls_t *tls, char **restrict alp) msg_Dbg(obj, " - encrypt then MAC (RFC7366) enabled"); if (flags & GNUTLS_SFLAGS_FALSE_START) msg_Dbg(obj, " - false start (RFC7918) enabled"); -#endif if (alp != NULL) { _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
