From 6b41bab71eb98b3b39c6b7e9c0167efc5c73dcad Mon Sep 17 00:00:00 2001 From: Victor Julien Date: Mon, 20 Jan 2025 13:05:32 +0100 Subject: [PATCH] detect: reuse hook based generic lists --- src/detect-dns-query.c | 10 ---------- src/detect-tls-cert-validity.c | 5 +---- src/detect-tls-certs.c | 5 +---- 3 files changed, 2 insertions(+), 18 deletions(-) diff --git a/src/detect-dns-query.c b/src/detect-dns-query.c index ef510f15287a..b814d5d09632 100644 --- a/src/detect-dns-query.c +++ b/src/detect-dns-query.c @@ -115,16 +115,6 @@ void DetectDnsQueryRegister (void) DetectBufferTypeSupportsMultiInstance("dns_query"); g_dns_query_buffer_id = DetectBufferTypeGetByName("dns_query"); - - /* register these generic engines from here for now */ - DetectAppLayerInspectEngineRegister( - "dns_request", ALPROTO_DNS, SIG_FLAG_TOSERVER, 1, DetectEngineInspectGenericList, NULL); - DetectAppLayerInspectEngineRegister("dns_response", ALPROTO_DNS, SIG_FLAG_TOCLIENT, 1, - DetectEngineInspectGenericList, NULL); - - DetectBufferTypeSetDescriptionByName("dns_request", - "dns requests"); - DetectBufferTypeSetDescriptionByName("dns_response", "dns responses"); } diff --git a/src/detect-tls-cert-validity.c b/src/detect-tls-cert-validity.c index 2e142b0265e8..82123767601e 100644 --- a/src/detect-tls-cert-validity.c +++ b/src/detect-tls-cert-validity.c @@ -123,10 +123,7 @@ void DetectTlsValidityRegister (void) DetectSetupParseRegexes(PARSE_REGEX, &parse_regex); - DetectAppLayerInspectEngineRegister("tls_validity", ALPROTO_TLS, SIG_FLAG_TOCLIENT, - TLS_STATE_SERVER_CERT_DONE, DetectEngineInspectGenericList, NULL); - - g_tls_validity_buffer_id = DetectBufferTypeGetByName("tls_validity"); + g_tls_validity_buffer_id = DetectBufferTypeGetByName("tls:server_cert_done:generic"); } /** diff --git a/src/detect-tls-certs.c b/src/detect-tls-certs.c index 27d219c5f12a..131b4517af40 100644 --- a/src/detect-tls-certs.c +++ b/src/detect-tls-certs.c @@ -157,7 +157,7 @@ static int DetectTlsCertsSetup(DetectEngineCtx *de_ctx, Signature *s, } static int g_tls_cert_buffer_id = 0; -#define BUFFER_NAME "tls_validity" +#define BUFFER_NAME "tls:server_cert_done:generic" #define KEYWORD_ID DETECT_AL_TLS_CHAIN_LEN #define KEYWORD_NAME "tls.cert_chain_len" #define KEYWORD_DESC "match TLS certificate chain length" @@ -252,9 +252,6 @@ void DetectTlsCertChainLenRegister(void) sigmatch_table[KEYWORD_ID].Setup = DetectTLSCertChainLenSetup; sigmatch_table[KEYWORD_ID].Free = DetectTLSCertChainLenFree; - DetectAppLayerInspectEngineRegister(BUFFER_NAME, ALPROTO_TLS, SIG_FLAG_TOCLIENT, - TLS_STATE_SERVER_CERT_DONE, DetectEngineInspectGenericList, NULL); - g_tls_cert_buffer_id = DetectBufferTypeGetByName(BUFFER_NAME); }