Blob Blame History Raw
From 858d3355e4f7de925ce653a7cb3604d58f54a8a0 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 15 Aug 2019 17:28:30 +1200
Subject: [PATCH 109/187] build: Remove explicit check for HAVE_GNUTLS_AEAD as
 we require GnuTLS 3.4.7

We strictly require it and if this were to fail we would want the compile to fail.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit 068da56a20a2712e498fb3724407836bda2f977b)
---
 wscript_configure_system_gnutls | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/wscript_configure_system_gnutls b/wscript_configure_system_gnutls
index 02e6567ba2f..68cc306e3dc 100644
--- a/wscript_configure_system_gnutls
+++ b/wscript_configure_system_gnutls
@@ -15,14 +15,6 @@ 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')
-
 if conf.CHECK_VALUEOF('GNUTLS_CIPHER_AES_128_CFB8', headers='gnutls/gnutls.h'):
     conf.DEFINE('HAVE_GNUTLS_AES_CFB8', 1)
 else:
-- 
2.23.0