From 073fcbeb7fb70fbf576eda841c07a4ba0fe0c4cc Mon Sep 17 00:00:00 2001
From: Victor Julien <victor@inliniac.net>
Date: Fri, 23 Dec 2016 13:59:25 +0100
Subject: [PATCH] detect: move file hash common code

---
 src/Makefile.am                                            | 2 +-
 src/{util-detect-file-hash.c => detect-file-hash-common.c} | 2 +-
 src/{util-detect-file-hash.h => detect-file-hash-common.h} | 0
 src/detect-filemd5.c                                       | 2 +-
 src/detect-filesha1.c                                      | 2 +-
 src/detect-filesha256.c                                    | 2 +-
 6 files changed, 5 insertions(+), 5 deletions(-)
 rename src/{util-detect-file-hash.c => detect-file-hash-common.c} (99%)
 rename src/{util-detect-file-hash.h => detect-file-hash-common.h} (100%)

diff --git a/src/Makefile.am b/src/Makefile.am
index 7d505307db..6ddbd1d8f6 100644
--- 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 7ee4bd9568..3e5d433d98 100644
--- 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 a4f3f56dfe..29320832fc 100644
--- 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 3bb26b5746..84fd689296 100644
--- 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 b95831e7da..59f06d2f78 100644
--- 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"