lib:crypto: Build intel aes-ni only if GnuTLS doesn't provide AES CMAC

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Tue Dec 10 20:30:57 UTC 2019 on sn-devel-184

diff --git a/lib/crypto/wscript_build b/lib/crypto/wscript_build
index 46ae5e9ba80b2fa9c5ad62bee07b8eceb740ac18..eb67af63f26025844285579d5b31c173003e976c 100644 (file)
--- a/lib/crypto/wscript_build
+++ b/lib/crypto/wscript_build
@@ -2,7 +2,8 @@
 
 extra_deps = ''
 
-if bld.CONFIG_SET("HAVE_AESNI_INTEL"):
+if (bld.CONFIG_SET("HAVE_AESNI_INTEL") and
+    not bld.CONFIG_SET('HAVE_GNUTLS_AES_CMAC')):
         extra_deps += ' aesni-intel'
 
 bld.SAMBA_SUBSYSTEM('GNUTLS_HELPERS',

diff --git a/third_party/aesni-intel/wscript b/third_party/aesni-intel/wscript
index 955b5162140d14410236d5ee767f5a92b1a15b13..382b3c6a7ff8b585f94f291c74596b2eda16189c 100644 (file)
--- a/third_party/aesni-intel/wscript
+++ b/third_party/aesni-intel/wscript
@@ -21,7 +21,8 @@ def configure(conf):
             raise Errors.WafError('--accel-aes=intelaesni selected and linker rejects -z noexecstack')
 
 def build(bld):
-    if not bld.CONFIG_SET('HAVE_AESNI_INTEL'):
+    if (not bld.CONFIG_SET('HAVE_AESNI_INTEL') or
+        bld.CONFIG_SET('HAVE_GNUTLS_AES_CMAC')):
         return
 
     bld.SAMBA_LIBRARY('aesni-intel',