diff options
author | Andrew Tridgell <tridge@samba.org> | 2009-09-15 18:46:18 -0700 |
---|---|---|
committer | Andrew Tridgell <tridge@samba.org> | 2009-09-15 18:46:18 -0700 |
commit | 7744283c36803836f698c12710e8c0ec8fbd8e93 (patch) | |
tree | 62ef35c75a812c7bca36c59d3b90cd0c3095d06f /lib/crypto/config.mk | |
parent | a04caf329fefccad0fc272474025f6d23a4deaa2 (diff) | |
parent | 10e25fc5e90e9eaabedc2f3477ac1e8947c88c77 (diff) | |
download | samba-7744283c36803836f698c12710e8c0ec8fbd8e93.tar.gz samba-7744283c36803836f698c12710e8c0ec8fbd8e93.tar.bz2 samba-7744283c36803836f698c12710e8c0ec8fbd8e93.zip |
Merge branch 'master' of /home/tridge/samba/git/combined
Diffstat (limited to 'lib/crypto/config.mk')
-rw-r--r-- | lib/crypto/config.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/crypto/config.mk b/lib/crypto/config.mk index e39f06dcae..c9ba779be2 100644 --- a/lib/crypto/config.mk +++ b/lib/crypto/config.mk @@ -6,7 +6,8 @@ LIBCRYPTO_OBJ_FILES = $(addprefix $(libcryptosrcdir)/, \ crc32.o md5.o hmacmd5.o md4.o \ - arcfour.o sha256.o hmacsha256.o) + arcfour.o sha256.o hmacsha256.o \ + aes.o rijndael-alg-fst.o) [SUBSYSTEM::TORTURE_LIBCRYPTO] PRIVATE_DEPENDENCIES = LIBCRYPTO |