krb5: move to app-layer

jasonish · Dec 4, 2023 · 1a47d48 · 1a47d48
1 parent aaace84
commit 1a47d48
Show file tree

Hide file tree

Showing 19 changed files with 34 additions and 34 deletions.
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -33,7 +33,7 @@ noinst_HEADERS = \
 	app-layer-htp-xff.h \
 	app-layer-http2.h \
 	app-layer/ike/parser.h \
-	app-layer-krb5.h \
+	app-layer/krb5/parser.h \
 	app-layer/modbus/parser.h \
 	app-layer-quic.h \
 	app-layer/mqtt/parser.h \
@@ -230,11 +230,11 @@ noinst_HEADERS = \
 	detect-ipv6hdr.h \
 	detect-isdataat.h \
 	detect-itype.h \
-	detect-krb5-cname.h \
-	detect-krb5-errcode.h \
-	detect-krb5-msgtype.h \
-	detect-krb5-sname.h \
-	detect-krb5-ticket-encryption.h \
+	app-layer/krb5/detect-cname.h \
+	app-layer/krb5/detect-errcode.h \
+	app-layer/krb5/detect-msgtype.h \
+	app-layer/krb5/detect-sname.h \
+	app-layer/krb5/detect-ticket-encryption.h \
 	detect-l3proto.h \
 	detect-lua-extensions.h \
 	detect-lua.h \
@@ -413,7 +413,7 @@ noinst_HEADERS = \
 	output-json-http2.h \
 	output-json-http.h \
 	app-layer/ike/logger.h \
-	output-json-krb5.h \
+	app-layer/krb5/logger.h \
 	output-json-metadata.h \
 	app-layer/modbus/logger.h \
 	output-json-quic.h \
@@ -649,7 +649,7 @@ libsuricata_c_a_SOURCES = \
 	app-layer-htp-xff.c \
 	app-layer-http2.c \
 	app-layer/ike/parser.c \
-	app-layer-krb5.c \
+	app-layer/krb5/parser.c \
 	app-layer/modbus/parser.c \
 	app-layer-quic.c \
 	app-layer/mqtt/parser.c \
@@ -843,11 +843,11 @@ libsuricata_c_a_SOURCES = \
 	detect-ipv6hdr.c \
 	detect-isdataat.c \
 	detect-itype.c \
-	detect-krb5-cname.c \
-	detect-krb5-errcode.c \
-	detect-krb5-msgtype.c \
-	detect-krb5-sname.c \
-	detect-krb5-ticket-encryption.c \
+	app-layer/krb5/detect-cname.c \
+	app-layer/krb5/detect-errcode.c \
+	app-layer/krb5/detect-msgtype.c \
+	app-layer/krb5/detect-sname.c \
+	app-layer/krb5/detect-ticket-encryption.c \
 	detect-l3proto.c \
 	detect-lua.c \
 	detect-lua-extensions.c \
@@ -1025,7 +1025,7 @@ libsuricata_c_a_SOURCES = \
 	output-json-http2.c \
 	output-json-http.c \
 	app-layer/ike/logger.c \
-	output-json-krb5.c \
+	app-layer/krb5/logger.c \
 	output-json-metadata.c \
 	app-layer/modbus/logger.c \
 	output-json-quic.c \

diff --git a/src/app-layer-parser.c b/src/app-layer-parser.c
@@ -54,7 +54,7 @@
 #include "app-layer/ntp/parser.h"
 #include "app-layer/tftp/parser.h"
 #include "app-layer/ike/parser.h"
-#include "app-layer-krb5.h"
+#include "app-layer/krb5/parser.h"
 #include "app-layer/sip/parser.h"
 #include "app-layer-rfb.h"
 #include "app-layer/mqtt/parser.h"

diff --git a/src/detect-krb5-cname.c → src/app-layer/krb5/detect-cname.c b/src/detect-krb5-cname.c → src/app-layer/krb5/detect-cname.c
@@ -31,10 +31,10 @@
 #include "detect-engine-prefilter.h"
 #include "detect-engine-content-inspection.h"
 
-#include "detect-krb5-cname.h"
+#include "app-layer/krb5/detect-cname.h"
 
 #include "rust.h"
-#include "app-layer-krb5.h"
+#include "app-layer/krb5/parser.h"
 #include "util-profiling.h"
 
 static int g_krb5_cname_buffer_id = 0;

diff --git a/src/detect-krb5-cname.h → src/app-layer/krb5/detect-cname.h b/src/detect-krb5-cname.h → src/app-layer/krb5/detect-cname.h
diff --git a/src/detect-krb5-errcode.c → src/app-layer/krb5/detect-errcode.c b/src/detect-krb5-errcode.c → src/app-layer/krb5/detect-errcode.c
@@ -28,9 +28,9 @@
 #include "detect-parse.h"
 #include "detect-engine.h"
 
-#include "detect-krb5-errcode.h"
+#include "app-layer/krb5/detect-errcode.h"
 
-#include "app-layer-krb5.h"
+#include "app-layer/krb5/parser.h"
 #include "rust.h"
 
 /**

diff --git a/src/detect-krb5-errcode.h → src/app-layer/krb5/detect-errcode.h b/src/detect-krb5-errcode.h → src/app-layer/krb5/detect-errcode.h
diff --git a/src/detect-krb5-msgtype.c → src/app-layer/krb5/detect-msgtype.c b/src/detect-krb5-msgtype.c → src/app-layer/krb5/detect-msgtype.c
@@ -28,9 +28,9 @@
 #include "detect-parse.h"
 #include "detect-engine.h"
 
-#include "detect-krb5-msgtype.h"
+#include "app-layer/krb5/detect-msgtype.h"
 
-#include "app-layer-krb5.h"
+#include "app-layer/krb5/parser.h"
 #include "rust.h"
 
 /**

diff --git a/src/detect-krb5-msgtype.h → src/app-layer/krb5/detect-msgtype.h b/src/detect-krb5-msgtype.h → src/app-layer/krb5/detect-msgtype.h
diff --git a/src/detect-krb5-sname.c → src/app-layer/krb5/detect-sname.c b/src/detect-krb5-sname.c → src/app-layer/krb5/detect-sname.c
@@ -31,10 +31,10 @@
 #include "detect-engine-prefilter.h"
 #include "detect-engine-content-inspection.h"
 
-#include "detect-krb5-sname.h"
+#include "app-layer/krb5/detect-sname.h"
 
 #include "rust.h"
-#include "app-layer-krb5.h"
+#include "app-layer/krb5/parser.h"
 #include "util-profiling.h"
 
 static int g_krb5_sname_buffer_id = 0;

diff --git a/src/detect-krb5-sname.h → src/app-layer/krb5/detect-sname.h b/src/detect-krb5-sname.h → src/app-layer/krb5/detect-sname.h
diff --git a/src/detect-krb5-ticket-encryption.c → ...app-layer/krb5/detect-ticket-encryption.c b/src/detect-krb5-ticket-encryption.c → ...app-layer/krb5/detect-ticket-encryption.c
@@ -18,7 +18,7 @@
 #include "suricata-common.h"
 #include "rust.h"
 
-#include "detect-krb5-ticket-encryption.h"
+#include "app-layer/krb5/detect-ticket-encryption.h"
 
 #include "detect-engine.h"
 #include "detect-parse.h"

diff --git a/src/detect-krb5-ticket-encryption.h → ...app-layer/krb5/detect-ticket-encryption.h b/src/detect-krb5-ticket-encryption.h → ...app-layer/krb5/detect-ticket-encryption.h
diff --git a/src/output-json-krb5.c → src/app-layer/krb5/logger.c b/src/output-json-krb5.c → src/app-layer/krb5/logger.c
@@ -43,8 +43,8 @@
 #include "app-layer.h"
 #include "app-layer-parser.h"
 
-#include "app-layer-krb5.h"
-#include "output-json-krb5.h"
+#include "app-layer/krb5/parser.h"
+#include "app-layer/krb5/logger.h"
 
 #include "rust.h"
 

diff --git a/src/output-json-krb5.h → src/app-layer/krb5/logger.h b/src/output-json-krb5.h → src/app-layer/krb5/logger.h
diff --git a/src/app-layer-krb5.c → src/app-layer/krb5/parser.c b/src/app-layer-krb5.c → src/app-layer/krb5/parser.c
@@ -32,7 +32,7 @@
 #include "app-layer-detect-proto.h"
 #include "app-layer-parser.h"
 
-#include "app-layer-krb5.h"
+#include "app-layer/krb5/parser.h"
 #include "rust.h"
 
 void RegisterKRB5Parsers(void)

diff --git a/src/app-layer-krb5.h → src/app-layer/krb5/parser.h b/src/app-layer-krb5.h → src/app-layer/krb5/parser.h
diff --git a/src/detect-engine-register.c b/src/detect-engine-register.c
@@ -186,11 +186,11 @@
 #include "detect-icmpv6-mtu.h"
 #include "detect-ipv4hdr.h"
 #include "detect-ipv6hdr.h"
-#include "detect-krb5-cname.h"
-#include "detect-krb5-errcode.h"
-#include "detect-krb5-msgtype.h"
-#include "detect-krb5-sname.h"
-#include "detect-krb5-ticket-encryption.h"
+#include "app-layer/krb5/detect-cname.h"
+#include "app-layer/krb5/detect-errcode.h"
+#include "app-layer/krb5/detect-msgtype.h"
+#include "app-layer/krb5/detect-sname.h"
+#include "app-layer/krb5/detect-ticket-encryption.h"
 #include "app-layer/sip/detect-method.h"
 #include "app-layer/sip/detect-uri.h"
 #include "app-layer/sip/detect-protocol.h"

diff --git a/src/output.c b/src/output.c
@@ -72,7 +72,7 @@
 #include "app-layer/tftp/logger.h"
 #include "app-layer/smb/logger.h"
 #include "app-layer/ike/logger.h"
-#include "output-json-krb5.h"
+#include "app-layer/krb5/logger.h"
 #include "output-json-quic.h"
 #include "output-json-dhcp.h"
 #include "output-json-snmp.h"

diff --git a/src/rust-context.h b/src/rust-context.h
@@ -22,7 +22,7 @@
 #include "detect.h"
 #include "detect-engine-state.h" //DetectEngineState
 
-#include "app-layer-krb5.h" //KRB5State, KRB5Transaction
+#include "app-layer/krb5/parser.h" //KRB5State, KRB5Transaction
 #include "app-layer/ike/parser.h"  //IKEState, IKETransaction
 #include "app-layer/ntp/parser.h"  //NTPState, NTPTransaction
 #include "app-layer-snmp.h" //SNMPState, SNMPTransaction