build: Set minimum GnuTLS version at 3.4.7
authorAndrew Bartlett <abartlet@samba.org>
Thu, 15 Aug 2019 02:25:41 +0000 (14:25 +1200)
committerAndreas Schneider <asn@cryptomilk.org>
Wed, 21 Aug 2019 09:57:31 +0000 (09:57 +0000)
This will soon be required for encrypted_secrets in the AD DC, the BackupKey server
and SMB2 as we remove use of the internal AES code.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
wscript_configure_system_gnutls

index 85824aad4edd17d7f944b467d6445104e0a83cbb..8ff0529e10cab6dbb54dc8235fd9de976b82a759 100644 (file)
@@ -1,17 +1,9 @@
 from waflib import Options
 
-gnutls_min_required_version = "3.2.0"
+gnutls_min_required_version = "3.4.7"
 
 gnutls_required_version = gnutls_min_required_version
 
-#
-# If we build with MIT Kerberos we need at least GnuTLS 3.4.7 for the backupkey
-# protocol.
-#
-if Options.options.with_system_mitkrb5 and conf.env.AD_DC_BUILD_IS_ENABLED:
-    gnutls_required_version = "3.4.7"
-    conf.DEFINE('HAVE_GNUTLS_3_4_7', 1)
-
 conf.CHECK_CFG(package='gnutls',
                args=('"gnutls >= %s" --cflags --libs' % gnutls_required_version),
                      msg='Checking for GnuTLS >= %s' % gnutls_required_version,
@@ -39,6 +31,5 @@ else:
 
 if conf.CHECK_VALUEOF('GNUTLS_CIPHER_AES_128_CFB8', headers='gnutls/gnutls.h'):
     conf.DEFINE('HAVE_GNUTLS_AES_CFB8', 1)
-    conf.DEFINE('HAVE_GNUTLS_3_4_7', 1)
 else:
     Logs.warn('No gnutls support for AES CFB8')