From e3373e9d1463fc26f52dfea18fca4739578e482e Mon Sep 17 00:00:00 2001 From: Douglas Bagnall Date: Fri, 26 Jun 2015 15:33:28 +1200 Subject: [PATCH] Revert "lib: Fix deps for LIBCRYPTO" 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 Reviewed-by: Volker Lendecke Reviewed-by: Michael Adam Autobuild-User(master): Volker Lendecke Autobuild-Date(master): Sun Jun 28 11:47:16 CEST 2015 on sn-devel-104 --- lib/crypto/wscript_build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/crypto/wscript_build b/lib/crypto/wscript_build index 0224feba414..f2326a266f9 100644 --- a/lib/crypto/wscript_build +++ b/lib/crypto/wscript_build @@ -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' ) -- 2.11.4.GIT