X-Git-Url: http://git.samba.org/?p=samba.git;a=blobdiff_plain;f=lib%2Fcrypto%2Fwscript_build;h=6841f99d5682f4dbb0095a3847b1cd98d00d2d9d;hp=e056f653fb9ae731317c3ac6378863bf5a36e8e6;hb=fdb6305c861a088f797d29889c51c0553cc048be;hpb=30a224367595f9e2506e41053fc9c7cb96a90928

diff --git a/lib/crypto/wscript_build b/lib/crypto/wscript_build
index e056f653fb9..6841f99d568 100644
--- a/lib/crypto/wscript_build
+++ b/lib/crypto/wscript_build
@@ -8,19 +8,29 @@ elif bld.CONFIG_SET('HAVE_SYS_MD5_H') and bld.CONFIG_SET('HAVE_LIBMD5'):
 	extra_deps += ' md5'
 elif bld.CONFIG_SET('HAVE_SYS_MD5_H') and bld.CONFIG_SET('HAVE_LIBMD'):
 	extra_deps += ' md'
-elif not bld.CONFIG_SET('HAVE_COMMONCRYPTO_COMMONDIGEST_H'):
+elif not bld.CONFIG_SET('HAVE_SYS_MD5_H') and not bld.CONFIG_SET('HAVE_COMMONCRYPTO_COMMONDIGEST_H'):
 	extra_source += ' md5.c'
 
+if bld.CONFIG_SET("HAVE_AESNI_INTEL"):
+        extra_deps += ' aesni-intel'
+
 bld.SAMBA_SUBSYSTEM('LIBCRYPTO',
-        source='''crc32.c hmacmd5.c md4.c arcfour.c sha256.c hmacsha256.c
-        aes.c rijndael-alg-fst.c aes_cmac_128.c aes_ccm_128.c
+        source='''hmacmd5.c md4.c arcfour.c sha256.c sha512.c hmacsha256.c
+        aes.c rijndael-alg-fst.c aes_cmac_128.c aes_ccm_128.c aes_gcm_128.c
         ''' + extra_source,
         deps='talloc' + extra_deps
         )
 
 bld.SAMBA_SUBSYSTEM('TORTURE_LIBCRYPTO',
-	source='md4test.c md5test.c hmacmd5test.c aes_cmac_128_test.c',
-	autoproto='test_proto.h',
-	deps='LIBCRYPTO'
-	)
+        source='''md4test.c md5test.c hmacmd5test.c
+            aes_cmac_128_test.c aes_ccm_128_test.c aes_gcm_128_test.c
+        ''',
+        autoproto='test_proto.h',
+        deps='LIBCRYPTO'
+        )
 
+bld.SAMBA_PYTHON('python_crypto',
+		 source='py_crypto.c',
+		 deps='LIBCRYPTO',
+		 realname='samba/crypto.so'
+		)