r25931: Add config .mk file for crypto lib.

(This used to be commit 21ab43158f723069dd70fae43d780878c38ead31)

diff --git a/source4/lib/basic.mk b/source4/lib/basic.mk
index aa1a5df19c31190acd52f770dfe033e5c09019ed..d1ed7ede0dcc45f4e1c0bfed7f4bb5130dd20d78 100644 (file)
--- a/source4/lib/basic.mk
+++ b/source4/lib/basic.mk
@@ -16,30 +16,7 @@ include stream/config.mk
 include util/config.mk
 include tdr/config.mk
 include dbwrap/config.mk
-
-##############################
-# Start SUBSYSTEM LIBCRYPTO
-[SUBSYSTEM::LIBCRYPTO]
-OBJ_FILES = \
-               crypto/crc32.o \
-               crypto/md5.o \
-               crypto/hmacmd5.o \
-               crypto/md4.o \
-               crypto/arcfour.o \
-               crypto/sha1.o \
-               crypto/hmacsha1.o
-# End SUBSYSTEM LIBCRYPTO
-##############################
-
-[MODULE::TORTURE_LIBCRYPTO]
-OBJ_FILES = \
-               crypto/md4test.o \
-               crypto/md5test.o \
-               crypto/hmacmd5test.o \
-               crypto/sha1test.o \
-               crypto/hmacsha1test.o
-SUBSYSTEM = torture
-PRIVATE_DEPENDENCIES = LIBCRYPTO
+include crypto/config.mk
 
 ################################################
 # Start SUBSYSTEM LIBCOMPRESSION

diff --git a/source4/lib/crypto/config.mk b/source4/lib/crypto/config.mk
new file mode 100644 (file)
index 0000000..f7a8d20
--- /dev/null
+++ b/source4/lib/crypto/config.mk
@@ -0,0 +1,26 @@
+##############################
+# Start SUBSYSTEM LIBCRYPTO
+[SUBSYSTEM::LIBCRYPTO]
+OBJ_FILES = \
+               crc32.o \
+               md5.o \
+               hmacmd5.o \
+               md4.o \
+               arcfour.o \
+               sha1.o \
+               hmacsha1.o
+# End SUBSYSTEM LIBCRYPTO
+##############################
+
+[MODULE::TORTURE_LIBCRYPTO]
+OBJ_FILES = \
+               md4test.o \
+               md5test.o \
+               hmacmd5test.o \
+               sha1test.o \
+               hmacsha1test.o
+SUBSYSTEM = torture
+PRIVATE_DEPENDENCIES = LIBCRYPTO
+PRIVATE_PROTO_HEADER = test_proto.h
+
+

diff --git a/source4/torture/local/local.c b/source4/torture/local/local.c
index bee9550bc5a2db4f303b402880f69cd3c0dfdd31..432575c990b8d45704c2a5d2e99face3cb743b9f 100644 (file)
--- a/source4/torture/local/local.c
+++ b/source4/torture/local/local.c
@@ -23,6 +23,7 @@
 #include "torture/ndr/ndr.h"
 #include "torture/ndr/proto.h"
 #include "torture/auth/proto.h"
+#include "lib/crypto/test_proto.h"
 
 /* ignore me */ static struct torture_suite *
        (*suite_generators[]) (TALLOC_CTX *mem_ctx) =