idmap_hash: provide ID_TYPE_BOTH mappings

[metze/samba/wip.git] / wscript_configure_system_gnutls

diff --git a/wscript_configure_system_gnutls b/wscript_configure_system_gnutls
index 02e6567ba2f3b98899249afed95399c085a72de2..f6d9ac3c65ef7cd98a25dcf412440aad12ce0072 100644 (file)
--- a/wscript_configure_system_gnutls
+++ b/wscript_configure_system_gnutls
@@ -15,15 +15,15 @@ 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 (>= 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 AES CMAC')