|
 |
b6b438 |
From 858d3355e4f7de925ce653a7cb3604d58f54a8a0 Mon Sep 17 00:00:00 2001
|
|
|
b6b438 |
From: Andrew Bartlett <abartlet@samba.org>
|
|
|
b6b438 |
Date: Thu, 15 Aug 2019 17:28:30 +1200
|
|
|
b6b438 |
Subject: [PATCH 109/187] build: Remove explicit check for HAVE_GNUTLS_AEAD as
|
|
|
b6b438 |
we require GnuTLS 3.4.7
|
|
|
b6b438 |
|
|
|
b6b438 |
We strictly require it and if this were to fail we would want the compile to fail.
|
|
|
b6b438 |
|
|
|
b6b438 |
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
|
|
|
b6b438 |
Reviewed-by: Andreas Schneider <asn@samba.org>
|
|
|
b6b438 |
(cherry picked from commit 068da56a20a2712e498fb3724407836bda2f977b)
|
|
|
b6b438 |
---
|
|
|
b6b438 |
wscript_configure_system_gnutls | 8 --------
|
|
|
b6b438 |
1 file changed, 8 deletions(-)
|
|
|
b6b438 |
|
|
|
b6b438 |
diff --git a/wscript_configure_system_gnutls b/wscript_configure_system_gnutls
|
|
|
b6b438 |
index 02e6567ba2f..68cc306e3dc 100644
|
|
|
b6b438 |
--- a/wscript_configure_system_gnutls
|
|
|
b6b438 |
+++ b/wscript_configure_system_gnutls
|
|
|
b6b438 |
@@ -15,14 +15,6 @@ conf.SET_TARGET_TYPE('gnutls', 'SYSLIB')
|
|
|
b6b438 |
# Check for gnutls_pkcs7_get_embedded_data_oid (>= 3.5.5) required by libmscat
|
|
|
b6b438 |
conf.CHECK_FUNCS_IN('gnutls_pkcs7_get_embedded_data_oid', 'gnutls')
|
|
|
b6b438 |
|
|
|
b6b438 |
-# Check for gnutls_aead_cipher_init (>= 3.4.0) used by encrypted_secrets
|
|
|
b6b438 |
-if conf.CHECK_FUNCS_IN('gnutls_aead_cipher_init',
|
|
|
b6b438 |
- 'gnutls',
|
|
|
b6b438 |
- headers='gnutls/gnutls.h'):
|
|
|
b6b438 |
- conf.DEFINE('HAVE_GNUTLS_AEAD', '1')
|
|
|
b6b438 |
-else:
|
|
|
b6b438 |
- Logs.warn('No gnutls support for AEAD encryption')
|
|
|
b6b438 |
-
|
|
|
b6b438 |
if conf.CHECK_VALUEOF('GNUTLS_CIPHER_AES_128_CFB8', headers='gnutls/gnutls.h'):
|
|
|
b6b438 |
conf.DEFINE('HAVE_GNUTLS_AES_CFB8', 1)
|
|
|
b6b438 |
else:
|
|
|
b6b438 |
--
|
|
|
b6b438 |
2.23.0
|
|
|
b6b438 |
|