Moves mbedtls to others and renames msc_string.h to string.h

others/Makefile.am

@@ -1,12 +1,24 @@
 
-noinst_LTLIBRARIES = libinjection.la
+noinst_LTLIBRARIES = libinjection.la libmbedtls.la
 libinjection_la_SOURCES = \
 	libinjection/src/libinjection_html5.c \
-    libinjection/src/libinjection_sqli.c \
-    libinjection/src/libinjection_xss.c
+	libinjection/src/libinjection_sqli.c \
+	libinjection/src/libinjection_xss.c
 
-noinst_HEADERS = libinjection/src/libinjection.h \
-       libinjection/src/libinjection_html5.h \
-       libinjection/src/libinjection_sqli.h \
-       libinjection/src/libinjection_sqli_data.h \
-       libinjection/src/libinjection_xss.h
+noinst_HEADERS = \
+	libinjection/src/libinjection.h \
+	libinjection/src/libinjection_html5.h \
+	libinjection/src/libinjection_sqli.h \
+	libinjection/src/libinjection_sqli_data.h \
+	libinjection/src/libinjection_xss.h
+
+
+
+libmbedtls_la_SOURCES = \
+	mbedtls/base64.c \
+	mbedtls/md5.c \
+	mbedtls/sha1.c
+
+libmbedtls_la_CFLAGS = -D MBEDTLS_CONFIG_FILE=\"mbed-tls-config.h\" -Iothers
+libmbedtls_la_CPPFLAGS =
+libmbedtls_la_LIBADD =

src/Makefile.am

@@ -3,22 +3,9 @@ BUILT_SOURCES= \
 	parser/seclang-parser.cc
 
 lib_LTLIBRARIES = libmodsecurity.la
-noinst_LTLIBRARIES = libmbedtls.la
 libmodsecurity_ladir = $(prefix)/include
 libmodsecurity_includesubdir = $(pkgincludedir)/collection/
 
-
-
-libmbedtls_la_SOURCES = \
-	utils/mbedtls/base64.c \
-	utils/mbedtls/md5.c \
-	utils/mbedtls/sha1.c
-
-libmbedtls_la_CFLAGS = -D MBEDTLS_CONFIG_FILE=\"mbed-tls-config.h\" -Iutils
-libmbedtls_la_CPPFLAGS =
-libmbedtls_la_LIBADD =
-
-
 CLEANFILES = \
 	location.hh \
 	position.hh \
@@ -63,7 +50,6 @@ noinst_HEADERS = \
 	parser/*.h \
 	request_body_processor/*.h \
 	utils/*.h \
-	utils/mbedtls/*.h \
 	variables/*.h \
 	variables/variations/*.h \
 	*.h
@@ -273,9 +259,10 @@ libmodsecurity_la_CPPFLAGS = \
 	-std=c++11 \
 	-I.. \
 	-g \
+	-I../others \
 	-fPIC \
 	-O3 \
-	-I ../headers \
+	-I../headers \
 	$(GEOIP_CFLAGS) \
 	$(GLOBAL_CPPFLAGS) \
 	$(MODSEC_NO_LOGS) \
@@ -294,7 +281,7 @@ libmodsecurity_la_LIBADD = \
 	$(LMDB_LDFLAGS) $(LMDB_LDADD) \
 	$(LIBXML2_LDADD) \
 	../others/libinjection.la \
-	libmbedtls.la
+	../others/libmbedtls.la
 
 
 libmodsecurity_la_LDFLAGS = \

src/utils/md5.cc

@@ -1,7 +1,7 @@
 
 
 #include "src/utils/md5.h"
-#include "src/utils/mbedtls/md5.h"
+#include "others/mbedtls/md5.h"
 
 namespace modsecurity {
 namespace Utils {

src/utils/sha1.cc

@@ -15,7 +15,7 @@
 
 
 #include "src/utils/sha1.h"
-#include "src/utils/mbedtls/sha1.h"
+#include "others/mbedtls/sha1.h"
 #include <fstream>
 #include <iostream>
 #include <cstring>