detect: move file hash common code

diff --git a/src/Makefile.am b/src/Makefile.am
index 7d505307dba28d10692308d702b463d3dcabc7c1..6ddbd1d8f6b35e735bc82343fa77b9cbf121da23 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -142,6 +142,7 @@ detect-engine-threshold.c detect-engine-threshold.h \
 detect-engine-uri.c detect-engine-uri.h \
 detect-fast-pattern.c detect-fast-pattern.h \
 detect-file-data.c detect-file-data.h \
+detect-file-hash-common.c detect-file-hash-common.h \
 detect-fileext.c detect-fileext.h \
 detect-filemagic.c detect-filemagic.h \
 detect-filemd5.c detect-filemd5.h \
@@ -364,7 +365,6 @@ util-decode-asn1.c util-decode-asn1.h \
 util-decode-der.c util-decode-der.h \
 util-decode-der-get.c util-decode-der-get.h \
 util-decode-mime.c util-decode-mime.h \
-util-detect-file-hash.c util-detect-file-hash.h \
 util-device.c util-device.h \
 util-enum.c util-enum.h \
 util-error.c util-error.h \

diff --git a/src/util-detect-file-hash.c b/src/detect-file-hash-common.c
similarity index 99%
rename from src/util-detect-file-hash.c
rename to src/detect-file-hash-common.c
index 7ee4bd9568787f4c16a84d27ac15c1e932c591e2..3e5d433d987c234e873fa7fcf460cb7b7c9b839a 100644 (file)
--- a/src/util-detect-file-hash.c
+++ b/src/detect-file-hash-common.c
@@ -28,7 +28,7 @@
 #include "detect.h"
 #include "detect-parse.h"
 
-#include "util-detect-file-hash.h"
+#include "detect-file-hash-common.h"
 
 #include "app-layer-htp.h"
 

diff --git a/src/util-detect-file-hash.h b/src/detect-file-hash-common.h
similarity index 100%
rename from src/util-detect-file-hash.h
rename to src/detect-file-hash-common.h

diff --git a/src/detect-filemd5.c b/src/detect-filemd5.c
index a4f3f56dfe7c3d7f4736f6c4c5d9cb84ec49ba7e..29320832fc3c04800604771413db4e983c07f9e3 100644 (file)
--- a/src/detect-filemd5.c
+++ b/src/detect-filemd5.c
@@ -25,7 +25,7 @@
 #include "suricata-common.h"
 
 #include "detect-engine.h"
-#include "util-detect-file-hash.h"
+#include "detect-file-hash-common.h"
 #include "util-unittest.h"
 #include "util-unittest-helper.h"
 

diff --git a/src/detect-filesha1.c b/src/detect-filesha1.c
index 3bb26b5746a1da910bcde5c414b0e5374c144940..84fd689296425f5473e7ae85ba3bba07d7686907 100644 (file)
--- a/src/detect-filesha1.c
+++ b/src/detect-filesha1.c
@@ -26,7 +26,7 @@
 #include "suricata-common.h"
 
 #include "detect-engine.h"
-#include "util-detect-file-hash.h"
+#include "detect-file-hash-common.h"
 #include "util-unittest.h"
 #include "util-unittest-helper.h"
 

diff --git a/src/detect-filesha256.c b/src/detect-filesha256.c
index b95831e7da20dc4af1e090cafd7617987bb6c3a3..59f06d2f78784b43b82e4a7fbdd4fd587f7356c0 100644 (file)
--- a/src/detect-filesha256.c
+++ b/src/detect-filesha256.c
@@ -26,7 +26,7 @@
 #include "suricata-common.h"
 
 #include "detect-engine.h"
-#include "util-detect-file-hash.h"
+#include "detect-file-hash-common.h"
 #include "util-unittest.h"
 #include "util-unittest-helper.h"