Skip to content

Commit

Permalink
Revert "lib: Fix deps for LIBCRYPTO"
Browse files Browse the repository at this point in the history
This reverts commit 30bfb8d.

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 <[email protected]>
Reviewed-by: Volker Lendecke <[email protected]>
Reviewed-by: Michael Adam <[email protected]>

Autobuild-User(master): Volker Lendecke <[email protected]>
Autobuild-Date(master): Sun Jun 28 11:47:16 CEST 2015 on sn-devel-104
  • Loading branch information
douglasbagnall authored and vlendec committed Jun 28, 2015
1 parent 15ac12a commit e3373e9
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions lib/crypto/wscript_build
Original file line number Diff line number Diff line change
Expand Up @@ -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'
)

0 comments on commit e3373e9

Please sign in to comment.