s3: smbd: Move the fsp check up one level from check_access().

[samba.git] / wscript_configure_system_gnutls

diff --git a/wscript_configure_system_gnutls b/wscript_configure_system_gnutls
index 02e6567ba2f3b98899249afed95399c085a72de2..cd2f5596e11250608f07ca4e3cfcf605aa43ae05 100644 (file)
--- a/wscript_configure_system_gnutls
+++ b/wscript_configure_system_gnutls
@@ -1,5 +1,8 @@
 from waflib import Options
 
+def parse_version(v):
+    return tuple(map(int, (v.split("."))))
+
 gnutls_min_required_version = "3.4.7"
 
 gnutls_required_version = gnutls_min_required_version
@@ -9,21 +12,33 @@ conf.CHECK_CFG(package='gnutls',
                      msg='Checking for GnuTLS >= %s' % gnutls_required_version,
                      mandatory=True)
 
+gnutls_version = conf.cmd_and_log(conf.env.PKGCONFIG + ['--modversion', 'gnutls']).strip()
+
 # Define gnutls as a system library
 conf.SET_TARGET_TYPE('gnutls', 'SYSLIB')
 
 # 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')
-else:
-    Logs.warn('No gnutls support for AEAD encryption')
+# Check for gnutls_aead_cipher_encryptv2
+#
+# This is available since version 3.6.10, but 3.6.10 has a bug which got fixed
+# in 3.6.11, see:
+#
+#     https://gitlab.com/gnutls/gnutls/-/merge_requests/1085
+if (parse_version('3.6.10') != parse_version(gnutls_version)):
+    conf.CHECK_FUNCS_IN('gnutls_aead_cipher_encryptv2', 'gnutls')
+
+# Check if we have support for crypto policies
+if conf.CHECK_FUNCS_IN('gnutls_get_system_config_file', 'gnutls'):
+    conf.DEFINE('HAVE_GNUTLS_CRYPTO_POLICIES', 1)
 
 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 AES CMAC')