From a26f8cc0db69bb4879b069d42b7e006ecd151dc6 Mon Sep 17 00:00:00 2001
From: Dmitry Volyntsev <xeioex@nginx.com>
Date: Wed, 14 Feb 2024 21:34:02 -0800
Subject: [PATCH] Moving hash code out of the njs core.

---
 auto/modules                 | 5 ++++-
 auto/sources                 | 3 ---
 external/njs_crypto_module.c | 2 +-
 {src => external}/njs_hash.h | 0
 {src => external}/njs_md5.c  | 6 +++++-
 {src => external}/njs_sha1.c | 6 +++++-
 {src => external}/njs_sha2.c | 6 +++++-
 src/njs_main.h               | 2 --
 8 files changed, 20 insertions(+), 10 deletions(-)
 rename {src => external}/njs_hash.h (100%)
 rename {src => external}/njs_md5.c (98%)
 rename {src => external}/njs_sha1.c (98%)
 rename {src => external}/njs_sha2.c (98%)

diff --git a/auto/modules b/auto/modules
index 93858691..421ab2cf 100644
--- 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 d97021c9..d5637a52 100644
--- 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 b66501bd..2781a485 100644
--- 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 a6b00803..dfd9d53e 100644
--- 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 0f5f4e9b..e5ca6ee9 100644
--- 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 8d051e49..2e146347 100644
--- 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 f52ee9a4..563065a1 100644
--- 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>
 
-- 
2.47.3