tls: register mpm from keywords

src/detect-engine-mpm.c

@@ -97,13 +97,6 @@ typedef struct AppLayerMpms_ {
 } AppLayerMpms;
 
 AppLayerMpms app_mpms[] = {
-    { "tls_sni", 0, SIG_FLAG_TOSERVER, DETECT_SM_LIST_TLSSNI_MATCH,
-        PrefilterTxTlsSniRegister, 0},
-    { "tls_cert_issuer", 0, SIG_FLAG_TOCLIENT, DETECT_SM_LIST_TLSISSUER_MATCH,
-        PrefilterTxTlsIssuerRegister, 0},
-    { "tls_cert_subject", 0, SIG_FLAG_TOCLIENT, DETECT_SM_LIST_TLSSUBJECT_MATCH,
-        PrefilterTxTlsSubjectRegister, 0},
-
     { NULL, 0, 0, 0, NULL, 0, }
 };
 

src/detect-tls-cert-issuer.c

@@ -32,6 +32,7 @@
 #include "detect-parse.h"
 #include "detect-engine.h"
 #include "detect-engine-mpm.h"
+#include "detect-engine-tls.h"
 #include "detect-content.h"
 #include "detect-pcre.h"
 
@@ -70,6 +71,10 @@ void DetectTlsIssuerRegister(void)
 
     sigmatch_table[DETECT_AL_TLS_CERT_ISSUER].flags |= SIGMATCH_NOOPT;
     sigmatch_table[DETECT_AL_TLS_CERT_ISSUER].flags |= SIGMATCH_PAYLOAD;
+
+    DetectMpmAppLayerRegister("tls_cert_issuer", SIG_FLAG_TOCLIENT,
+            DETECT_SM_LIST_TLSISSUER_MATCH,
+            PrefilterTxTlsIssuerRegister);
 }
 
 

src/detect-tls-cert-subject.c

@@ -32,6 +32,7 @@
 #include "detect-parse.h"
 #include "detect-engine.h"
 #include "detect-engine-mpm.h"
+#include "detect-engine-tls.h"
 #include "detect-content.h"
 #include "detect-pcre.h"
 
@@ -70,6 +71,10 @@ void DetectTlsSubjectRegister(void)
 
     sigmatch_table[DETECT_AL_TLS_CERT_SUBJECT].flags |= SIGMATCH_NOOPT;
     sigmatch_table[DETECT_AL_TLS_CERT_SUBJECT].flags |= SIGMATCH_PAYLOAD;
+
+    DetectMpmAppLayerRegister("tls_cert_subject", SIG_FLAG_TOCLIENT,
+            DETECT_SM_LIST_TLSSUBJECT_MATCH,
+            PrefilterTxTlsSubjectRegister);
 }
 
 /**

src/detect-tls-sni.c

@@ -48,6 +48,7 @@
 
 #include "app-layer.h"
 #include "app-layer-ssl.h"
+#include "detect-engine-tls.h"
 
 #include "util-unittest.h"
 #include "util-unittest-helper.h"
@@ -70,6 +71,11 @@ void DetectTlsSniRegister(void)
 
     sigmatch_table[DETECT_AL_TLS_SNI].flags |= SIGMATCH_NOOPT;
     sigmatch_table[DETECT_AL_TLS_SNI].flags |= SIGMATCH_PAYLOAD;
+
+    DetectMpmAppLayerRegister("tls_sni", SIG_FLAG_TOSERVER,
+            DETECT_SM_LIST_TLSSNI_MATCH,
+            PrefilterTxTlsSniRegister);
+
 }