Revert "lib: Fix deps for LIBCRYPTO"
authorDouglas Bagnall <douglas.bagnall@catalyst.net.nz>
Fri, 26 Jun 2015 03:33:28 +0000 (15:33 +1200)
committerVolker Lendecke <vl@samba.org>
Sun, 28 Jun 2015 09:47:16 +0000 (11:47 +0200)
This reverts commit 30bfb8d63804f0c98312fadaadcb104120dadafb.

Talloc is still needed by LIBCRYPTO, because arcfour.h
includes lib/util/data_blob.h which includes talloc.h.

It seems arcfour only uses the DATA_BLOB struct (in e.g. arcfour_crypt
and arcfour_init).

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
Autobuild-User(master): Volker Lendecke <vl@samba.org>
Autobuild-Date(master): Sun Jun 28 11:47:16 CEST 2015 on sn-devel-104

lib/crypto/wscript_build

index 0224feba41483dead9a6348dad9f0d44f3352509..f2326a266f918c70439a3411af44123558cde87d 100644 (file)
@@ -15,12 +15,12 @@ bld.SAMBA_SUBSYSTEM('LIBCRYPTO',
         source='''crc32.c 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=extra_deps
+        deps='talloc' + extra_deps
         )
 
 bld.SAMBA_SUBSYSTEM('TORTURE_LIBCRYPTO',
        source='md4test.c md5test.c hmacmd5test.c aes_cmac_128_test.c aes_gcm_128_test.c',
        autoproto='test_proto.h',
-       deps='talloc LIBCRYPTO'
+       deps='LIBCRYPTO'
        )