Move source4/lib/crypto to lib/crypto.

47 files changed, 35 insertions, 35 deletions

diff --git a/source4/lib/crypto/arcfour.c b/lib/crypto/arcfour.c
index 94196fa1ee1..94196fa1ee1 100644
--- a/source4/lib/crypto/arcfour.c
+++ b/lib/crypto/arcfour.c
diff --git a/source4/lib/crypto/config.mk b/lib/crypto/config.mk
index ee111bd0882..ee111bd0882 100644
--- a/source4/lib/crypto/config.mk
+++ b/lib/crypto/config.mk
diff --git a/source4/lib/crypto/crc32.c b/lib/crypto/crc32.c
index 5b9d9b108d1..5b9d9b108d1 100644
--- a/source4/lib/crypto/crc32.c
+++ b/lib/crypto/crc32.c
diff --git a/source4/lib/crypto/crc32.h b/lib/crypto/crc32.h
index 7854abf865a..7854abf865a 100644
--- a/source4/lib/crypto/crc32.h
+++ b/lib/crypto/crc32.h
diff --git a/source4/lib/crypto/crypto.h b/lib/crypto/crypto.h
index fc283f72ba4..9cb16ad3447 100644
--- a/source4/lib/crypto/crypto.h
+++ b/lib/crypto/crypto.h
@@ -17,12 +17,12 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "lib/crypto/crc32.h"
-#include "lib/crypto/md4.h"
-#include "lib/crypto/md5.h"
-#include "lib/crypto/hmacmd5.h"
-#include "lib/crypto/sha256.h"
-#include "lib/crypto/hmacsha256.h"
+#include "../lib/crypto/crc32.h"
+#include "../lib/crypto/md4.h"
+#include "../lib/crypto/md5.h"
+#include "../lib/crypto/hmacmd5.h"
+#include "../lib/crypto/sha256.h"
+#include "../lib/crypto/hmacsha256.h"
 
 struct arcfour_state {
 	uint8_t sbox[256];
diff --git a/source4/lib/crypto/hmacmd5.c b/lib/crypto/hmacmd5.c
index 3a9ec38a27c..3a9ec38a27c 100644
--- a/source4/lib/crypto/hmacmd5.c
+++ b/lib/crypto/hmacmd5.c
diff --git a/source4/lib/crypto/hmacmd5.h b/lib/crypto/hmacmd5.h
index 5769737fcd6..5769737fcd6 100644
--- a/source4/lib/crypto/hmacmd5.h
+++ b/lib/crypto/hmacmd5.h
diff --git a/source4/lib/crypto/hmacmd5test.c b/lib/crypto/hmacmd5test.c
index 07ed54c98d2..07ed54c98d2 100644
--- a/source4/lib/crypto/hmacmd5test.c
+++ b/lib/crypto/hmacmd5test.c
diff --git a/source4/lib/crypto/hmacsha256.c b/lib/crypto/hmacsha256.c
index 6b0af9ee835..6b0af9ee835 100644
--- a/source4/lib/crypto/hmacsha256.c
+++ b/lib/crypto/hmacsha256.c
diff --git a/source4/lib/crypto/hmacsha256.h b/lib/crypto/hmacsha256.h
index 8960c636c1b..8960c636c1b 100644
--- a/source4/lib/crypto/hmacsha256.h
+++ b/lib/crypto/hmacsha256.h
diff --git a/source4/lib/crypto/md4.c b/lib/crypto/md4.c
index 7ad93ce786f..7ad93ce786f 100644
--- a/source4/lib/crypto/md4.c
+++ b/lib/crypto/md4.c
diff --git a/source4/lib/crypto/md4.h b/lib/crypto/md4.h
index 234e488e4ff..234e488e4ff 100644
--- a/source4/lib/crypto/md4.h
+++ b/lib/crypto/md4.h
diff --git a/source4/lib/crypto/md4test.c b/lib/crypto/md4test.c
index 5e0451973c8..5e0451973c8 100644
--- a/source4/lib/crypto/md4test.c
+++ b/lib/crypto/md4test.c
diff --git a/source4/lib/crypto/md5.c b/lib/crypto/md5.c
index 584c46ef2d6..584c46ef2d6 100644
--- a/source4/lib/crypto/md5.c
+++ b/lib/crypto/md5.c
diff --git a/source4/lib/crypto/md5.h b/lib/crypto/md5.h
index 4064d6f0039..4064d6f0039 100644
--- a/source4/lib/crypto/md5.h
+++ b/lib/crypto/md5.h
diff --git a/source4/lib/crypto/md5test.c b/lib/crypto/md5test.c
index 702e0fcf416..702e0fcf416 100644
--- a/source4/lib/crypto/md5test.c
+++ b/lib/crypto/md5test.c
diff --git a/source4/lib/crypto/sha256.c b/lib/crypto/sha256.c
index a2def258148..a2def258148 100644
--- a/source4/lib/crypto/sha256.c
+++ b/lib/crypto/sha256.c
diff --git a/source4/lib/crypto/sha256.h b/lib/crypto/sha256.h
index 4a5f2cbe947..4a5f2cbe947 100644
--- a/source4/lib/crypto/sha256.h
+++ b/lib/crypto/sha256.h
diff --git a/source4/Makefile b/source4/Makefile
index 11057ae5f31..3630adce56f 100644
--- a/source4/Makefile
+++ b/source4/Makefile
@@ -77,7 +77,7 @@ libstreamsrcdir := lib/stream
 libutilsrcdir := lib/util
 libtdrsrcdir := lib/tdr
 libdbwrapsrcdir := lib/dbwrap
-libcryptosrcdir := lib/crypto
+libcryptosrcdir := ../lib/crypto
 libtorturesrcdir := lib/torture
 smb_serversrcdir := smb_server
 libcompressionsrcdir := ../lib/compression
diff --git a/source4/auth/credentials/credentials_ntlm.c b/source4/auth/credentials/credentials_ntlm.c
index 22e273c35af..ef41971462b 100644
--- a/source4/auth/credentials/credentials_ntlm.c
+++ b/source4/auth/credentials/credentials_ntlm.c
@@ -23,7 +23,7 @@
 
 #include "includes.h"
 #include "librpc/gen_ndr/samr.h" /* for struct samrPassword */
-#include "lib/crypto/crypto.h"
+#include "../lib/crypto/crypto.h"
 #include "libcli/auth/libcli_auth.h"
 #include "auth/credentials/credentials.h"
 
diff --git a/source4/auth/gensec/schannel_sign.c b/source4/auth/gensec/schannel_sign.c
index 1e57beba089..9862a029a43 100644
--- a/source4/auth/gensec/schannel_sign.c
+++ b/source4/auth/gensec/schannel_sign.c
@@ -21,7 +21,7 @@
 */
 
 #include "includes.h"
-#include "lib/crypto/crypto.h"
+#include "../lib/crypto/crypto.h"
 #include "auth/auth.h"
 #include "auth/gensec/schannel.h"
 #include "auth/credentials/credentials.h"
diff --git a/source4/auth/ntlm/ntlm_check.c b/source4/auth/ntlm/ntlm_check.c
index 0dbbce0edc5..62dec84f1de 100644
--- a/source4/auth/ntlm/ntlm_check.c
+++ b/source4/auth/ntlm/ntlm_check.c
@@ -20,7 +20,7 @@
 */
 
 #include "includes.h"
-#include "lib/crypto/crypto.h"
+#include "../lib/crypto/crypto.h"
 #include "librpc/gen_ndr/netlogon.h"
 #include "libcli/auth/libcli_auth.h"
 #include "param/param.h"
diff --git a/source4/auth/ntlmssp/ntlmssp_client.c b/source4/auth/ntlmssp/ntlmssp_client.c
index 891761860c5..eb990dee9cb 100644
--- a/source4/auth/ntlmssp/ntlmssp_client.c
+++ b/source4/auth/ntlmssp/ntlmssp_client.c
@@ -24,7 +24,7 @@
 #include "includes.h"
 #include "auth/ntlmssp/ntlmssp.h"
 #include "auth/ntlmssp/msrpc_parse.h"
-#include "lib/crypto/crypto.h"
+#include "../lib/crypto/crypto.h"
 #include "libcli/auth/libcli_auth.h"
 #include "auth/credentials/credentials.h"
 #include "auth/gensec/gensec.h"
diff --git a/source4/auth/ntlmssp/ntlmssp_server.c b/source4/auth/ntlmssp/ntlmssp_server.c
index bf91be3e240..ad1ee8e871b 100644
--- a/source4/auth/ntlmssp/ntlmssp_server.c
+++ b/source4/auth/ntlmssp/ntlmssp_server.c
@@ -24,7 +24,7 @@
 #include "includes.h"
 #include "auth/ntlmssp/ntlmssp.h"
 #include "auth/ntlmssp/msrpc_parse.h"
-#include "lib/crypto/crypto.h"
+#include "../lib/crypto/crypto.h"
 #include "libcli/auth/libcli_auth.h"
 #include "auth/credentials/credentials.h"
 #include "auth/gensec/gensec.h"
diff --git a/source4/auth/ntlmssp/ntlmssp_sign.c b/source4/auth/ntlmssp/ntlmssp_sign.c
index 063b16f5395..49ed48df984 100644
--- a/source4/auth/ntlmssp/ntlmssp_sign.c
+++ b/source4/auth/ntlmssp/ntlmssp_sign.c
@@ -23,7 +23,7 @@
 #include "auth/auth.h"
 #include "auth/ntlmssp/ntlmssp.h"
 #include "auth/ntlmssp/msrpc_parse.h"
-#include "lib/crypto/crypto.h"
+#include "../lib/crypto/crypto.h"
 #include "auth/credentials/credentials.h"
 #include "auth/gensec/gensec.h"
 #include "param/param.h"
diff --git a/source4/dsdb/repl/replicated_objects.c b/source4/dsdb/repl/replicated_objects.c
index 552d83f411c..2be01bac56f 100644
--- a/source4/dsdb/repl/replicated_objects.c
+++ b/source4/dsdb/repl/replicated_objects.c
@@ -26,7 +26,7 @@
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "librpc/gen_ndr/ndr_drsuapi.h"
 #include "librpc/gen_ndr/ndr_drsblobs.h"
-#include "lib/crypto/crypto.h"
+#include "../lib/crypto/crypto.h"
 #include "libcli/auth/libcli_auth.h"
 #include "param/param.h"
 
diff --git a/source4/dsdb/samdb/ldb_modules/password_hash.c b/source4/dsdb/samdb/ldb_modules/password_hash.c
index 69783aefa89..6faef63c3d7 100644
--- a/source4/dsdb/samdb/ldb_modules/password_hash.c
+++ b/source4/dsdb/samdb/ldb_modules/password_hash.c
@@ -48,7 +48,7 @@
 #include "dsdb/samdb/ldb_modules/password_modules.h"
 #include "librpc/ndr/libndr.h"
 #include "librpc/gen_ndr/ndr_drsblobs.h"
-#include "lib/crypto/crypto.h"
+#include "../lib/crypto/crypto.h"
 #include "param/param.h"
 
 /* If we have decided there is reason to work on this request, then
diff --git a/source4/kdc/hdb-ldb.c b/source4/kdc/hdb-ldb.c
index cfd72c25ace..c5466f1acd3 100644
--- a/source4/kdc/hdb-ldb.c
+++ b/source4/kdc/hdb-ldb.c
@@ -50,7 +50,7 @@
 #include "param/param.h"
 #include "events/events.h"
 #include "kdc/kdc.h"
-#include "lib/crypto/md4.h"
+#include "../lib/crypto/md4.h"
 
 enum hdb_ldb_ent_type 
 { HDB_LDB_ENT_TYPE_CLIENT, HDB_LDB_ENT_TYPE_SERVER, 
diff --git a/source4/lib/util/genrand.c b/source4/lib/util/genrand.c
index 7df4ec4e20c..cd1823a9a07 100644
--- a/source4/lib/util/genrand.c
+++ b/source4/lib/util/genrand.c
@@ -21,7 +21,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
-#include "lib/crypto/crypto.h"
+#include "../lib/crypto/crypto.h"
 #include "system/locale.h"
 
 /**
diff --git a/source4/libcli/auth/credentials.c b/source4/libcli/auth/credentials.c
index a6cb17c12ea..3c77b0836de 100644
--- a/source4/libcli/auth/credentials.c
+++ b/source4/libcli/auth/credentials.c
@@ -23,7 +23,7 @@
 #include "includes.h"
 #include "system/time.h"
 #include "auth/auth.h"
-#include "lib/crypto/crypto.h"
+#include "../lib/crypto/crypto.h"
 #include "libcli/auth/libcli_auth.h"
 
 /*
diff --git a/source4/libcli/auth/smbencrypt.c b/source4/libcli/auth/smbencrypt.c
index b50f003b91f..3af7e45002c 100644
--- a/source4/libcli/auth/smbencrypt.c
+++ b/source4/libcli/auth/smbencrypt.c
@@ -25,7 +25,7 @@
 #include "system/time.h"
 #include "auth/ntlmssp/ntlmssp.h"
 #include "auth/ntlmssp/msrpc_parse.h"
-#include "lib/crypto/crypto.h"
+#include "../lib/crypto/crypto.h"
 #include "libcli/auth/libcli_auth.h"
 #include "pstring.h"
 #include "param/param.h"
diff --git a/source4/libcli/raw/smb_signing.c b/source4/libcli/raw/smb_signing.c
index 826d7dd56bf..e798f052ba1 100644
--- a/source4/libcli/raw/smb_signing.c
+++ b/source4/libcli/raw/smb_signing.c
@@ -23,7 +23,7 @@
 #include "smb.h"
 #include "libcli/raw/libcliraw.h"
 #include "libcli/raw/raw_proto.h"
-#include "lib/crypto/crypto.h"
+#include "../lib/crypto/crypto.h"
 #include "param/param.h"
 
 /***********************************************************
diff --git a/source4/libcli/smb2/signing.c b/source4/libcli/smb2/signing.c
index de9e1e9d29f..101fb00c124 100644
--- a/source4/libcli/smb2/signing.c
+++ b/source4/libcli/smb2/signing.c
@@ -23,7 +23,7 @@
 #include "libcli/raw/libcliraw.h"
 #include "libcli/smb2/smb2.h"
 #include "libcli/smb2/smb2_calls.h"
-#include "lib/crypto/crypto.h"
+#include "../lib/crypto/crypto.h"
 
 /*
   sign an outgoing message
diff --git a/source4/libnet/libnet_passwd.c b/source4/libnet/libnet_passwd.c
index 28d9ae8cbe6..de2ed01abd8 100644
--- a/source4/libnet/libnet_passwd.c
+++ b/source4/libnet/libnet_passwd.c
@@ -20,7 +20,7 @@
 
 #include "includes.h"
 #include "libnet/libnet.h"
-#include "lib/crypto/crypto.h"
+#include "../lib/crypto/crypto.h"
 #include "libcli/auth/libcli_auth.h"
 #include "librpc/gen_ndr/ndr_samr_c.h"
 
diff --git a/source4/main.mk b/source4/main.mk
index 0edfa1c1441..368dce9f59b 100644
--- a/source4/main.mk
+++ b/source4/main.mk
@@ -22,7 +22,7 @@ mkinclude lib/stream/config.mk
 mkinclude lib/util/config.mk
 mkinclude lib/tdr/config.mk
 mkinclude lib/dbwrap/config.mk
-mkinclude lib/crypto/config.mk
+mkinclude ../lib/crypto/config.mk
 mkinclude lib/torture/config.mk
 mkinclude lib/basic.mk
 mkinclude lib/com/config.mk
diff --git a/source4/ntp_signd/ntp_signd.c b/source4/ntp_signd/ntp_signd.c
index c3a9a1c792d..575be1e97e8 100644
--- a/source4/ntp_signd/ntp_signd.c
+++ b/source4/ntp_signd/ntp_signd.c
@@ -34,7 +34,7 @@
 #include "libcli/security/security.h"
 #include "lib/ldb/include/ldb.h"
 #include "lib/ldb/include/ldb_errors.h"
-#include "lib/crypto/md5.h"
+#include "../lib/crypto/md5.h"
 #include "system/passwd.h"
 
 /*
diff --git a/source4/rpc_server/lsa/dcesrv_lsa.c b/source4/rpc_server/lsa/dcesrv_lsa.c
index a1ca3b4a461..3b70f3e9346 100644
--- a/source4/rpc_server/lsa/dcesrv_lsa.c
+++ b/source4/rpc_server/lsa/dcesrv_lsa.c
@@ -27,7 +27,7 @@
 #include "auth/kerberos/kerberos.h"
 #include "librpc/gen_ndr/ndr_drsblobs.h"
 #include "librpc/gen_ndr/ndr_lsa.h"
-#include "lib/crypto/crypto.h"
+#include "../lib/crypto/crypto.h"
 
 /*
   this type allows us to distinguish handle types
diff --git a/source4/rpc_server/samr/samr_password.c b/source4/rpc_server/samr/samr_password.c
index 5b8e92583b6..98d998acc3d 100644
--- a/source4/rpc_server/samr/samr_password.c
+++ b/source4/rpc_server/samr/samr_password.c
@@ -25,7 +25,7 @@
 #include "rpc_server/common/common.h"
 #include "rpc_server/samr/dcesrv_samr.h"
 #include "system/time.h"
-#include "lib/crypto/crypto.h"
+#include "../lib/crypto/crypto.h"
 #include "dsdb/common/flags.h"
 #include "libcli/ldap/ldap.h"
 #include "dsdb/samdb/samdb.h"
diff --git a/source4/torture/local/local.c b/source4/torture/local/local.c
index bf53df4a11c..fdefbbe131e 100644
--- a/source4/torture/local/local.c
+++ b/source4/torture/local/local.c
@@ -23,7 +23,7 @@
 #include "torture/ndr/ndr.h"
 #include "torture/ndr/proto.h"
 #include "torture/auth/proto.h"
-#include "lib/crypto/test_proto.h"
+#include "../lib/crypto/test_proto.h"
 #include "lib/registry/tests/proto.h"
 
 /* ignore me */ static struct torture_suite *
diff --git a/source4/torture/rpc/dssync.c b/source4/torture/rpc/dssync.c
index e9346f96055..df16c860cbf 100644
--- a/source4/torture/rpc/dssync.c
+++ b/source4/torture/rpc/dssync.c
@@ -29,7 +29,7 @@
 #include "torture/torture.h"
 #include "torture/ldap/proto.h"
 #include "libcli/auth/libcli_auth.h"
-#include "lib/crypto/crypto.h"
+#include "../lib/crypto/crypto.h"
 #include "auth/credentials/credentials.h"
 #include "libcli/auth/libcli_auth.h"
 #include "auth/gensec/gensec.h"
diff --git a/source4/torture/rpc/lsa.c b/source4/torture/rpc/lsa.c
index a13a8d8818e..69bf33352b8 100644
--- a/source4/torture/rpc/lsa.c
+++ b/source4/torture/rpc/lsa.c
@@ -29,7 +29,7 @@
 #include "libcli/auth/libcli_auth.h"
 #include "torture/rpc/rpc.h"
 #include "param/param.h"
-#include "lib/crypto/crypto.h"
+#include "../lib/crypto/crypto.h"
 #define TEST_MACHINENAME "lsatestmach"
 
 static void init_lsa_String(struct lsa_String *name, const char *s)
diff --git a/source4/torture/rpc/samba3rpc.c b/source4/torture/rpc/samba3rpc.c
index 17342f9b867..3bbf6cf2230 100644
--- a/source4/torture/rpc/samba3rpc.c
+++ b/source4/torture/rpc/samba3rpc.c
@@ -47,7 +47,7 @@
 #include "libcli/composite/composite.h"
 #include "libcli/smb_composite/smb_composite.h"
 #include "libcli/auth/libcli_auth.h"
-#include "lib/crypto/crypto.h"
+#include "../lib/crypto/crypto.h"
 #include "auth/ntlmssp/ntlmssp.h"
 #include "libcli/security/proto.h"
 #include "param/param.h"
diff --git a/source4/torture/rpc/samlogon.c b/source4/torture/rpc/samlogon.c
index e2558ff0a95..4fbffee41ed 100644
--- a/source4/torture/rpc/samlogon.c
+++ b/source4/torture/rpc/samlogon.c
@@ -26,7 +26,7 @@
 #include "librpc/gen_ndr/ndr_netlogon_c.h"
 #include "librpc/gen_ndr/ndr_samr_c.h"
 #include "auth/auth.h"
-#include "lib/crypto/crypto.h"
+#include "../lib/crypto/crypto.h"
 #include "lib/cmdline/popt_common.h"
 #include "torture/rpc/rpc.h"
 #include "auth/gensec/schannel_proto.h"
diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c
index 6afda6e9b52..d0aee057d38 100644
--- a/source4/torture/rpc/samr.c
+++ b/source4/torture/rpc/samr.c
@@ -24,7 +24,7 @@
 #include "system/time.h"
 #include "librpc/gen_ndr/lsa.h"
 #include "librpc/gen_ndr/ndr_samr_c.h"
-#include "lib/crypto/crypto.h"
+#include "../lib/crypto/crypto.h"
 #include "libcli/auth/libcli_auth.h"
 #include "libcli/security/security.h"
 #include "torture/rpc/rpc.h"
diff --git a/source4/torture/rpc/samsync.c b/source4/torture/rpc/samsync.c
index 1e76de1dd2b..6a02af5bb5b 100644
--- a/source4/torture/rpc/samsync.c
+++ b/source4/torture/rpc/samsync.c
@@ -25,7 +25,7 @@
 #include "torture/torture.h"
 #include "auth/auth.h"
 #include "lib/util/dlinklist.h"
-#include "lib/crypto/crypto.h"
+#include "../lib/crypto/crypto.h"
 #include "system/time.h"
 #include "torture/rpc/rpc.h"
 #include "auth/gensec/schannel_proto.h"
diff --git a/source4/torture/rpc/testjoin.c b/source4/torture/rpc/testjoin.c
index 2af8c4f8727..21542e9b165 100644
--- a/source4/torture/rpc/testjoin.c
+++ b/source4/torture/rpc/testjoin.c
@@ -27,7 +27,7 @@
 #include "includes.h"
 #include "torture/torture.h"
 #include "system/time.h"
-#include "lib/crypto/crypto.h"
+#include "../lib/crypto/crypto.h"
 #include "libnet/libnet.h"
 #include "lib/cmdline/popt_common.h"
 #include "lib/ldb/include/ldb.h"
diff --git a/source4/torture/rpc/wkssvc.c b/source4/torture/rpc/wkssvc.c
index b212a44b338..6e9937086e6 100644
--- a/source4/torture/rpc/wkssvc.c
+++ b/source4/torture/rpc/wkssvc.c
@@ -25,7 +25,7 @@
 #include "torture/rpc/rpc.h"
 #include "lib/cmdline/popt_common.h"
 #include "param/param.h"
-#include "lib/crypto/crypto.h"
+#include "../lib/crypto/crypto.h"
 #include "libcli/auth/libcli_auth.h"
 
 #define SMBTORTURE_MACHINE_NAME "smbtrt_name"