[vlc-commits] gnutls: require GnuTLS 3.5.0+ for gnutls_session_get_flags()

Thomas Guillem git at videolan.org
Fri Feb 24 09:29:08 CET 2017


vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Fri Feb 24 09:27:47 2017 +0100| [be45fed445cbdb25d096c4f94c21e26649df9f95] | committer: Thomas Guillem

gnutls: require GnuTLS 3.5.0+ for gnutls_session_get_flags()

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=be45fed445cbdb25d096c4f94c21e26649df9f95
---

 modules/misc/gnutls.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/modules/misc/gnutls.c b/modules/misc/gnutls.c
index 973c669..e45110e 100644
--- a/modules/misc/gnutls.c
+++ b/modules/misc/gnutls.c
@@ -326,17 +326,15 @@ static int gnutls_ContinueHandshake(vlc_tls_creds_t *crd, vlc_tls_t *tls,
 
     unsigned flags;
 done:
+#if (GNUTLS_VERSION_NUMBER >= 0x030500)
     flags = gnutls_session_get_flags(session);
 
     if (flags & GNUTLS_SFLAGS_SAFE_RENEGOTIATION)
         msg_Dbg(crd, " - safe renegotiation (RFC5746) enabled");
-#if (GNUTLS_VERSION_NUMBER >= 0x030400)
     if (flags & GNUTLS_SFLAGS_EXT_MASTER_SECRET)
         msg_Dbg(crd, " - extended master secret (RFC7627) enabled");
     if (flags & GNUTLS_SFLAGS_ETM)
         msg_Dbg(crd, " - encrypt then MAC (RFC7366) enabled");
-#endif
-#if (GNUTLS_VERSION_NUMBER >= 0x030500)
     if (flags & GNUTLS_SFLAGS_FALSE_START)
         msg_Dbg(crd, " - false start (RFC7918) enabled");
 #endif



More information about the vlc-commits mailing list