librpc:core: Initialize static variable

[metze/samba/wip.git] / wscript_configure_system_gnutls

diff --git a/wscript_configure_system_gnutls b/wscript_configure_system_gnutls
index 2e4dc126f3a1408f2a8fe5bcaa06158f63df61ad..f6d9ac3c65ef7cd98a25dcf412440aad12ce0072 100644 (file)
--- a/wscript_configure_system_gnutls
+++ b/wscript_configure_system_gnutls
@@ -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,
@@ -20,16 +12,18 @@ conf.CHECK_CFG(package='gnutls',
 # Define gnutls as a system library
 conf.SET_TARGET_TYPE('gnutls', 'SYSLIB')
 
-# Check for gnutls_x509_crt_set_subject_unique_id (>= 3.4.7) required by backupkey
-conf.CHECK_FUNCS_IN('gnutls_x509_crt_set_subject_unique_id', 'gnutls')
-
 # Check for gnutls_pkcs7_get_embedded_data_oid (>= 3.5.5) required by libmscat
 conf.CHECK_FUNCS_IN('gnutls_pkcs7_get_embedded_data_oid', 'gnutls')
 
-# Check for gnutls_aead_cipher_init (>= 3.4.0) used by encrypted_secrets
-if conf.CHECK_FUNCS_IN('gnutls_aead_cipher_init',
-                       'gnutls',
-                       headers='gnutls/gnutls.h'):
-    conf.DEFINE('HAVE_GNUTLS_AEAD', '1')
+# Check for gnutls_aead_cipher_encryptv2 (>= 3.6.10)
+conf.CHECK_FUNCS_IN('gnutls_aead_cipher_encryptv2', 'gnutls')
+
+if conf.CHECK_VALUEOF('GNUTLS_CIPHER_AES_128_CFB8', headers='gnutls/gnutls.h'):
+    conf.DEFINE('HAVE_GNUTLS_AES_CFB8', 1)
+else:
+    Logs.warn('No gnutls support for AES CFB8')
+
+if conf.CHECK_VALUEOF('GNUTLS_MAC_AES_CMAC_128', headers='gnutls/gnutls.h'):
+    conf.DEFINE('HAVE_GNUTLS_AES_CMAC', 1)
 else:
-    Logs.warn('No gnutls support for AEAD encryption')
+    Logs.warn('No gnutls support for AES CMAC')