From 285855d928370d48edb73b78cba8de0315b7c0cc Mon Sep 17 00:00:00 2001 From: Mats Klepsland Date: Tue, 14 May 2019 08:44:19 +0200 Subject: [PATCH] detect-tls: remove NULL settings from keyword registration --- src/detect-tls-cert-fingerprint.c | 2 -- src/detect-tls-cert-issuer.c | 2 -- src/detect-tls-cert-serial.c | 2 -- src/detect-tls-cert-subject.c | 2 -- src/detect-tls-cert-validity.c | 4 ---- src/detect-tls-ja3-hash.c | 2 -- src/detect-tls-ja3-string.c | 2 -- src/detect-tls-sni.c | 2 -- 8 files changed, 18 deletions(-) diff --git a/src/detect-tls-cert-fingerprint.c b/src/detect-tls-cert-fingerprint.c index 056e2b52b7..2cd88a5edb 100644 --- a/src/detect-tls-cert-fingerprint.c +++ b/src/detect-tls-cert-fingerprint.c @@ -75,9 +75,7 @@ void DetectTlsFingerprintRegister(void) sigmatch_table[DETECT_AL_TLS_CERT_FINGERPRINT].alias = "tls_cert_fingerprint"; sigmatch_table[DETECT_AL_TLS_CERT_FINGERPRINT].desc = "content modifier to match the TLS cert fingerprint buffer"; sigmatch_table[DETECT_AL_TLS_CERT_FINGERPRINT].url = DOC_URL DOC_VERSION "/rules/tls-keywords.html#tls-cert-fingerprint"; - sigmatch_table[DETECT_AL_TLS_CERT_FINGERPRINT].Match = NULL; sigmatch_table[DETECT_AL_TLS_CERT_FINGERPRINT].Setup = DetectTlsFingerprintSetup; - sigmatch_table[DETECT_AL_TLS_CERT_FINGERPRINT].Free = NULL; sigmatch_table[DETECT_AL_TLS_CERT_FINGERPRINT].RegisterTests = DetectTlsFingerprintRegisterTests; sigmatch_table[DETECT_AL_TLS_CERT_FINGERPRINT].flags |= SIGMATCH_NOOPT; diff --git a/src/detect-tls-cert-issuer.c b/src/detect-tls-cert-issuer.c index 22e451ea28..fd405541eb 100644 --- a/src/detect-tls-cert-issuer.c +++ b/src/detect-tls-cert-issuer.c @@ -71,9 +71,7 @@ void DetectTlsIssuerRegister(void) sigmatch_table[DETECT_AL_TLS_CERT_ISSUER].alias = "tls_cert_issuer"; sigmatch_table[DETECT_AL_TLS_CERT_ISSUER].desc = "content modifier to match specifically and only on the TLS cert issuer buffer"; sigmatch_table[DETECT_AL_TLS_CERT_ISSUER].url = DOC_URL DOC_VERSION "/rules/tls-keywords.html#tls-cert-issuer"; - sigmatch_table[DETECT_AL_TLS_CERT_ISSUER].Match = NULL; sigmatch_table[DETECT_AL_TLS_CERT_ISSUER].Setup = DetectTlsIssuerSetup; - sigmatch_table[DETECT_AL_TLS_CERT_ISSUER].Free = NULL; sigmatch_table[DETECT_AL_TLS_CERT_ISSUER].RegisterTests = DetectTlsIssuerRegisterTests; sigmatch_table[DETECT_AL_TLS_CERT_ISSUER].flags |= SIGMATCH_NOOPT; diff --git a/src/detect-tls-cert-serial.c b/src/detect-tls-cert-serial.c index cdaf0ae5e3..95933400ad 100644 --- a/src/detect-tls-cert-serial.c +++ b/src/detect-tls-cert-serial.c @@ -75,9 +75,7 @@ void DetectTlsSerialRegister(void) sigmatch_table[DETECT_AL_TLS_CERT_SERIAL].alias = "tls_cert_serial"; sigmatch_table[DETECT_AL_TLS_CERT_SERIAL].desc = "content modifier to match the TLS cert serial buffer"; sigmatch_table[DETECT_AL_TLS_CERT_SERIAL].url = DOC_URL DOC_VERSION "/rules/tls-keywords.html#tls-cert-serial"; - sigmatch_table[DETECT_AL_TLS_CERT_SERIAL].Match = NULL; sigmatch_table[DETECT_AL_TLS_CERT_SERIAL].Setup = DetectTlsSerialSetup; - sigmatch_table[DETECT_AL_TLS_CERT_SERIAL].Free = NULL; sigmatch_table[DETECT_AL_TLS_CERT_SERIAL].RegisterTests = DetectTlsSerialRegisterTests; sigmatch_table[DETECT_AL_TLS_CERT_SERIAL].flags |= SIGMATCH_NOOPT; diff --git a/src/detect-tls-cert-subject.c b/src/detect-tls-cert-subject.c index 99c931c1c4..07da939d0f 100644 --- a/src/detect-tls-cert-subject.c +++ b/src/detect-tls-cert-subject.c @@ -71,9 +71,7 @@ void DetectTlsSubjectRegister(void) sigmatch_table[DETECT_AL_TLS_CERT_SUBJECT].alias = "tls_cert_subject"; sigmatch_table[DETECT_AL_TLS_CERT_SUBJECT].desc = "content modifier to match specifically and only on the TLS cert subject buffer"; sigmatch_table[DETECT_AL_TLS_CERT_SUBJECT].url = DOC_URL DOC_VERSION "/rules/tls-keywords.html#tls-cert-subject"; - sigmatch_table[DETECT_AL_TLS_CERT_SUBJECT].Match = NULL; sigmatch_table[DETECT_AL_TLS_CERT_SUBJECT].Setup = DetectTlsSubjectSetup; - sigmatch_table[DETECT_AL_TLS_CERT_SUBJECT].Free = NULL; sigmatch_table[DETECT_AL_TLS_CERT_SUBJECT].RegisterTests = DetectTlsSubjectRegisterTests; sigmatch_table[DETECT_AL_TLS_CERT_SUBJECT].flags |= SIGMATCH_NOOPT; diff --git a/src/detect-tls-cert-validity.c b/src/detect-tls-cert-validity.c index bd8ce69008..c7b885ae93 100644 --- a/src/detect-tls-cert-validity.c +++ b/src/detect-tls-cert-validity.c @@ -88,7 +88,6 @@ void DetectTlsValidityRegister (void) sigmatch_table[DETECT_AL_TLS_NOTBEFORE].name = "tls_cert_notbefore"; sigmatch_table[DETECT_AL_TLS_NOTBEFORE].desc = "match TLS certificate notBefore field"; sigmatch_table[DETECT_AL_TLS_NOTBEFORE].url = DOC_URL DOC_VERSION "/rules/tls-keywords.html#tls-cert-notbefore"; - sigmatch_table[DETECT_AL_TLS_NOTBEFORE].Match = NULL; sigmatch_table[DETECT_AL_TLS_NOTBEFORE].AppLayerTxMatch = DetectTlsValidityMatch; sigmatch_table[DETECT_AL_TLS_NOTBEFORE].Setup = DetectTlsNotBeforeSetup; sigmatch_table[DETECT_AL_TLS_NOTBEFORE].Free = DetectTlsValidityFree; @@ -97,7 +96,6 @@ void DetectTlsValidityRegister (void) sigmatch_table[DETECT_AL_TLS_NOTAFTER].name = "tls_cert_notafter"; sigmatch_table[DETECT_AL_TLS_NOTAFTER].desc = "match TLS certificate notAfter field"; sigmatch_table[DETECT_AL_TLS_NOTAFTER].url = DOC_URL DOC_VERSION "/rules/tls-keywords.html#tls-cert-notafter"; - sigmatch_table[DETECT_AL_TLS_NOTAFTER].Match = NULL; sigmatch_table[DETECT_AL_TLS_NOTAFTER].AppLayerTxMatch = DetectTlsValidityMatch; sigmatch_table[DETECT_AL_TLS_NOTAFTER].Setup = DetectTlsNotAfterSetup; sigmatch_table[DETECT_AL_TLS_NOTAFTER].Free = DetectTlsValidityFree; @@ -106,7 +104,6 @@ void DetectTlsValidityRegister (void) sigmatch_table[DETECT_AL_TLS_EXPIRED].name = "tls_cert_expired"; sigmatch_table[DETECT_AL_TLS_EXPIRED].desc = "match expired TLS certificates"; sigmatch_table[DETECT_AL_TLS_EXPIRED].url = DOC_URL DOC_VERSION "/rules/tls-keywords.html#tls-cert-expired"; - sigmatch_table[DETECT_AL_TLS_EXPIRED].Match = NULL; sigmatch_table[DETECT_AL_TLS_EXPIRED].AppLayerTxMatch = DetectTlsValidityMatch; sigmatch_table[DETECT_AL_TLS_EXPIRED].Setup = DetectTlsExpiredSetup; sigmatch_table[DETECT_AL_TLS_EXPIRED].Free = DetectTlsValidityFree; @@ -116,7 +113,6 @@ void DetectTlsValidityRegister (void) sigmatch_table[DETECT_AL_TLS_VALID].name = "tls_cert_valid"; sigmatch_table[DETECT_AL_TLS_VALID].desc = "match valid TLS certificates"; sigmatch_table[DETECT_AL_TLS_VALID].url = DOC_URL DOC_VERSION "/rules/tls-keywords.html#tls-cert-valid"; - sigmatch_table[DETECT_AL_TLS_VALID].Match = NULL; sigmatch_table[DETECT_AL_TLS_VALID].AppLayerTxMatch = DetectTlsValidityMatch; sigmatch_table[DETECT_AL_TLS_VALID].Setup = DetectTlsValidSetup; sigmatch_table[DETECT_AL_TLS_VALID].Free = DetectTlsValidityFree; diff --git a/src/detect-tls-ja3-hash.c b/src/detect-tls-ja3-hash.c index daf41f9d40..0e20f02e79 100644 --- a/src/detect-tls-ja3-hash.c +++ b/src/detect-tls-ja3-hash.c @@ -79,9 +79,7 @@ void DetectTlsJa3HashRegister(void) sigmatch_table[DETECT_AL_TLS_JA3_HASH].alias = "ja3_hash"; sigmatch_table[DETECT_AL_TLS_JA3_HASH].desc = "content modifier to match the JA3 hash buffer"; sigmatch_table[DETECT_AL_TLS_JA3_HASH].url = DOC_URL DOC_VERSION "/rules/ja3-keywords.html#ja3-hash"; - sigmatch_table[DETECT_AL_TLS_JA3_HASH].Match = NULL; sigmatch_table[DETECT_AL_TLS_JA3_HASH].Setup = DetectTlsJa3HashSetup; - sigmatch_table[DETECT_AL_TLS_JA3_HASH].Free = NULL; sigmatch_table[DETECT_AL_TLS_JA3_HASH].RegisterTests = DetectTlsJa3HashRegisterTests; sigmatch_table[DETECT_AL_TLS_JA3_HASH].flags |= SIGMATCH_NOOPT; diff --git a/src/detect-tls-ja3-string.c b/src/detect-tls-ja3-string.c index 1f22590658..c0949271a9 100644 --- a/src/detect-tls-ja3-string.c +++ b/src/detect-tls-ja3-string.c @@ -75,9 +75,7 @@ void DetectTlsJa3StringRegister(void) sigmatch_table[DETECT_AL_TLS_JA3_STRING].alias = "ja3_string"; sigmatch_table[DETECT_AL_TLS_JA3_STRING].desc = "content modifier to match the JA3 string buffer"; sigmatch_table[DETECT_AL_TLS_JA3_STRING].url = DOC_URL DOC_VERSION "/rules/ja3-keywords.html#ja3-string"; - sigmatch_table[DETECT_AL_TLS_JA3_STRING].Match = NULL; sigmatch_table[DETECT_AL_TLS_JA3_STRING].Setup = DetectTlsJa3StringSetup; - sigmatch_table[DETECT_AL_TLS_JA3_STRING].Free = NULL; sigmatch_table[DETECT_AL_TLS_JA3_STRING].RegisterTests = DetectTlsJa3StringRegisterTests; sigmatch_table[DETECT_AL_TLS_JA3_STRING].flags |= SIGMATCH_NOOPT; diff --git a/src/detect-tls-sni.c b/src/detect-tls-sni.c index e51f6f9945..cd1c0e7422 100644 --- a/src/detect-tls-sni.c +++ b/src/detect-tls-sni.c @@ -71,9 +71,7 @@ void DetectTlsSniRegister(void) sigmatch_table[DETECT_AL_TLS_SNI].alias = "tls_sni"; sigmatch_table[DETECT_AL_TLS_SNI].desc = "content modifier to match specifically and only on the TLS SNI buffer"; sigmatch_table[DETECT_AL_TLS_SNI].url = DOC_URL DOC_VERSION "/rules/tls-keywords.html#tls-sni"; - sigmatch_table[DETECT_AL_TLS_SNI].Match = NULL; sigmatch_table[DETECT_AL_TLS_SNI].Setup = DetectTlsSniSetup; - sigmatch_table[DETECT_AL_TLS_SNI].Free = NULL; sigmatch_table[DETECT_AL_TLS_SNI].RegisterTests = DetectTlsSniRegisterTests; sigmatch_table[DETECT_AL_TLS_SNI].flags |= SIGMATCH_NOOPT;