Moving hash code out of the njs core.

diff --git a/auto/modules b/auto/modules
index 93858691eae6d6431ff46d3d7c75627ef89334aa..421ab2cffb8f3cbb79f0c1f401b8b7cbe9cc5f81 100644 (file)
--- a/auto/modules
+++ b/auto/modules
@@ -9,7 +9,10 @@ njs_module_srcs=src/njs_buffer.c
 
 njs_module_name=njs_crypto_module
 njs_module_incs=
-njs_module_srcs=external/njs_crypto_module.c
+njs_module_srcs="external/njs_crypto_module.c \
+                 external/njs_md5.c \
+                 external/njs_sha1.c \
+                 external/njs_sha2.c"
 
 . auto/module
 

diff --git a/auto/sources b/auto/sources
index d97021c98f31c64f20581bcf08de2fea7e891d9e..d5637a52117aaca875f76014b9d6f20137f850f8 100644 (file)
--- a/auto/sources
+++ b/auto/sources
@@ -13,9 +13,6 @@ NJS_LIB_SRCS=" \
    src/njs_flathsh.c \
    src/njs_trace.c \
    src/njs_random.c \
-   src/njs_md5.c \
-   src/njs_sha1.c \
-   src/njs_sha2.c \
    src/njs_malloc.c \
    src/njs_mp.c \
    src/njs_sprintf.c \

diff --git a/external/njs_crypto_module.c b/external/njs_crypto_module.c
index b66501bdf4a7ef4b33a595bc34aa3b1142b279db..2781a4859a74027feedf8724f31c84eb6d3ffe0a 100644 (file)
--- a/external/njs_crypto_module.c
+++ b/external/njs_crypto_module.c
@@ -6,9 +6,9 @@
 
 
 #include <njs.h>
-#include <njs_hash.h>
 #include <njs_string.h>
 #include <njs_buffer.h>
+#include "njs_hash.h"
 
 
 typedef void (*njs_hash_init)(njs_hash_t *ctx);

diff --git a/src/njs_hash.h b/external/njs_hash.h
similarity index 100%
rename from src/njs_hash.h
rename to external/njs_hash.h

diff --git a/src/njs_md5.c b/external/njs_md5.c
similarity index 98%
rename from src/njs_md5.c
rename to external/njs_md5.c
index a6b0080387940b41df42e23df678aa3ae7c2ba48..dfd9d53e602f110148721606e742d3d06dea8b79 100644 (file)
--- a/src/njs_md5.c
+++ b/external/njs_md5.c
@@ -6,7 +6,11 @@
  */
 
 
-#include <njs_main.h>
+#include <njs_unix.h>
+#include <njs_types.h>
+#include <njs_clang.h>
+#include <njs_str.h>
+#include "njs_hash.h"
 
 
 static const u_char *njs_md5_body(njs_hash_t *ctx, const u_char *data,

diff --git a/src/njs_sha1.c b/external/njs_sha1.c
similarity index 98%
rename from src/njs_sha1.c
rename to external/njs_sha1.c
index 0f5f4e9b28606eee7f63e636b470513245ccabdf..e5ca6ee9fe0c9958e1a39c67d4c4fcca3ff8fc27 100644 (file)
--- a/src/njs_sha1.c
+++ b/external/njs_sha1.c
@@ -7,7 +7,11 @@
  */
 
 
-#include <njs_main.h>
+#include <njs_unix.h>
+#include <njs_types.h>
+#include <njs_clang.h>
+#include <njs_str.h>
+#include "njs_hash.h"
 
 
 static const u_char *njs_sha1_body(njs_hash_t *ctx, const u_char *data,

diff --git a/src/njs_sha2.c b/external/njs_sha2.c
similarity index 98%
rename from src/njs_sha2.c
rename to external/njs_sha2.c
index 8d051e491784fa3950fa62335f62327a20feeb04..2e146347e39fc6da64c91e903e6b482afbfb8dcf 100644 (file)
--- a/src/njs_sha2.c
+++ b/external/njs_sha2.c
@@ -7,7 +7,11 @@
  */
 
 
-#include <njs_main.h>
+#include <njs_unix.h>
+#include <njs_types.h>
+#include <njs_clang.h>
+#include <njs_str.h>
+#include "njs_hash.h"
 
 
 static const u_char *njs_sha2_body(njs_hash_t *ctx, const u_char *data,

diff --git a/src/njs_main.h b/src/njs_main.h
index f52ee9a46e61e0bf57c9e13d9b3b3a1fdbb760c6..563065a112c25ada3b6b9faa004e1f587baf20ca 100644 (file)
--- a/src/njs_main.h
+++ b/src/njs_main.h
@@ -39,8 +39,6 @@
 
 #include <njs_regex.h>
 
-#include <njs_hash.h>
-
 #include <njs.h>
 #include <njs_value.h>