aiden
/
suricata
mirror of https://github.com/OISF/suricata
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mpm tls: remove unused function args

Browse Source
pull/2310/head
Victor Julien 10 years ago
parent ad3a55d938
commit ff70e0cca0
5 changed files with 26 additions and 37 deletions
Show Stats Download Patch File Download Diff File

50
src/detect-engine-tls.c
Unescape Escape View File

@ -57,14 +57,12 @@
*/ */
static inline uint32_t TlsSniPatternSearch(DetectEngineThreadCtx *det_ctx, static inline uint32_t TlsSniPatternSearch(DetectEngineThreadCtx *det_ctx,
const uint8_t *buffer, const uint8_t *buffer,
const uint32_t buffer_len, const uint32_t buffer_len)
const uint8_t flags)
{ {
SCEnter(); SCEnter();
uint32_t ret = 0; uint32_t ret = 0;
DEBUG_VALIDATE_BUG_ON(flags & STREAM_TOCLIENT);
DEBUG_VALIDATE_BUG_ON(det_ctx->sgh->mpm_tlssni_ctx_ts == NULL); DEBUG_VALIDATE_BUG_ON(det_ctx->sgh->mpm_tlssni_ctx_ts == NULL);
if (buffer_len >= det_ctx->sgh->mpm_tlssni_ctx_ts->minlen) { if (buffer_len >= det_ctx->sgh->mpm_tlssni_ctx_ts->minlen) {
@ -86,8 +84,8 @@ static inline uint32_t TlsSniPatternSearch(DetectEngineThreadCtx *det_ctx,
* *
* \retval cnt Number of matches * \retval cnt Number of matches
*/ */
uint32_t DetectTlsSniInspectMpm(DetectEngineThreadCtx *det_ctx, Flow *f, uint32_t DetectTlsSniInspectMpm(DetectEngineThreadCtx *det_ctx,
SSLState *ssl_state, uint8_t flags) SSLState *ssl_state)
{ {
SCEnter(); SCEnter();
@ -101,7 +99,7 @@ uint32_t DetectTlsSniInspectMpm(DetectEngineThreadCtx *det_ctx, Flow *f,
buffer = (uint8_t *)ssl_state->client_connp.sni; buffer = (uint8_t *)ssl_state->client_connp.sni;
buffer_len = strlen(ssl_state->client_connp.sni); buffer_len = strlen(ssl_state->client_connp.sni);
cnt = TlsSniPatternSearch(det_ctx, buffer, buffer_len, flags); cnt = TlsSniPatternSearch(det_ctx, buffer, buffer_len);
SCReturnUInt(cnt); SCReturnUInt(cnt);
} }
@ -147,23 +145,20 @@ int DetectEngineInspectTlsSni(ThreadVars *tv, DetectEngineCtx *de_ctx,
/** /**
* \brief TLS issuer match -- searches for one pattern per signature. * \brief TLS issuer match -- searches for one pattern per signature.
* *
* \param det_ctx Detection engine thread ctx * \param det_ctx Detection engine thread ctx
* \param hrh Buffer to inspect * \param buffer Buffer to inspect
* \param hrh_len Buffer length * \param buffer_len Buffer length
* \param flags Flags
* *
* \retval ret Number of matches * \retval ret Number of matches
*/ */
static inline uint32_t TlsIssuerPatternSearch(DetectEngineThreadCtx *det_ctx, static inline uint32_t TlsIssuerPatternSearch(DetectEngineThreadCtx *det_ctx,
const uint8_t *buffer, const uint8_t *buffer,
const uint32_t buffer_len, const uint32_t buffer_len)
const uint8_t flags)
{ {
SCEnter(); SCEnter();
uint32_t ret = 0; uint32_t ret = 0;
DEBUG_VALIDATE_BUG_ON(flags & STREAM_TOSERVER);
DEBUG_VALIDATE_BUG_ON(det_ctx->sgh->mpm_tlsissuer_ctx_ts == NULL); DEBUG_VALIDATE_BUG_ON(det_ctx->sgh->mpm_tlsissuer_ctx_ts == NULL);
if (buffer_len >= det_ctx->sgh->mpm_tlsissuer_ctx_ts->minlen) { if (buffer_len >= det_ctx->sgh->mpm_tlsissuer_ctx_ts->minlen) {
@ -180,13 +175,12 @@ static inline uint32_t TlsIssuerPatternSearch(DetectEngineThreadCtx *det_ctx,
* *
* \param det_ctx Detection engine thread ctx * \param det_ctx Detection engine thread ctx
* \param f Locked flow * \param f Locked flow
* \param dns_state Initialized dns state * \param ssl_state Initialized ssl state
* \param flags Flags
* *
* \retval cnt Number of matches * \retval cnt Number of matches
*/ */
uint32_t DetectTlsIssuerInspectMpm(DetectEngineThreadCtx *det_ctx, Flow *f, uint32_t DetectTlsIssuerInspectMpm(DetectEngineThreadCtx *det_ctx, Flow *f,
SSLState *ssl_state, uint8_t flags) SSLState *ssl_state)
{ {
SCEnter(); SCEnter();
@ -200,7 +194,7 @@ uint32_t DetectTlsIssuerInspectMpm(DetectEngineThreadCtx *det_ctx, Flow *f,
buffer = (uint8_t *)ssl_state->server_connp.cert0_issuerdn; buffer = (uint8_t *)ssl_state->server_connp.cert0_issuerdn;
buffer_len = strlen(ssl_state->server_connp.cert0_issuerdn); buffer_len = strlen(ssl_state->server_connp.cert0_issuerdn);
cnt = TlsIssuerPatternSearch(det_ctx, buffer, buffer_len, flags); cnt = TlsIssuerPatternSearch(det_ctx, buffer, buffer_len);
SCReturnUInt(cnt); SCReturnUInt(cnt);
} }
@ -224,7 +218,7 @@ int DetectEngineInspectTlsIssuer(ThreadVars *tv, DetectEngineCtx *de_ctx,
uint64_t tx_id) uint64_t tx_id)
{ {
uint8_t *buffer; uint8_t *buffer;
uint16_t buffer_len; uint32_t buffer_len;
int cnt = 0; int cnt = 0;
SSLState *ssl_state = (SSLState *)alstate; SSLState *ssl_state = (SSLState *)alstate;
@ -246,23 +240,20 @@ int DetectEngineInspectTlsIssuer(ThreadVars *tv, DetectEngineCtx *de_ctx,
/** /**
* \brief TLS subject match -- searches for one pattern per signature. * \brief TLS subject match -- searches for one pattern per signature.
* *
* \param det_ctx Detection engine thread ctx * \param det_ctx Detection engine thread ctx
* \param hrh Buffer to inspect * \param buffer Buffer to inspect
* \param hrh_len Buffer length * \param buffer_len Buffer length
* \param flags Flags
* *
* \retval ret Number of matches * \retval ret Number of matches
*/ */
static inline uint32_t TlsSubjectPatternSearch(DetectEngineThreadCtx *det_ctx, static inline uint32_t TlsSubjectPatternSearch(DetectEngineThreadCtx *det_ctx,
const uint8_t *buffer, const uint8_t *buffer,
const uint32_t buffer_len, const uint32_t buffer_len)
const uint8_t flags)
{ {
SCEnter(); SCEnter();
uint32_t ret = 0; uint32_t ret = 0;
DEBUG_VALIDATE_BUG_ON(flags & STREAM_TOSERVER);
DEBUG_VALIDATE_BUG_ON(det_ctx->sgh->mpm_tlssubject_ctx_ts == NULL); DEBUG_VALIDATE_BUG_ON(det_ctx->sgh->mpm_tlssubject_ctx_ts == NULL);
if (buffer_len >= det_ctx->sgh->mpm_tlssubject_ctx_ts->minlen) { if (buffer_len >= det_ctx->sgh->mpm_tlssubject_ctx_ts->minlen) {
@ -279,13 +270,12 @@ static inline uint32_t TlsSubjectPatternSearch(DetectEngineThreadCtx *det_ctx,
* *
* \param det_ctx Detection engine thread ctx * \param det_ctx Detection engine thread ctx
* \param f Locked flow * \param f Locked flow
* \param dns_state Initialized dns state * \param ssl_state Initialized ssl state
* \param flags Flags
* *
* \retval cnt Number of matches * \retval cnt Number of matches
*/ */
uint32_t DetectTlsSubjectInspectMpm(DetectEngineThreadCtx *det_ctx, Flow *f, uint32_t DetectTlsSubjectInspectMpm(DetectEngineThreadCtx *det_ctx, Flow *f,
SSLState *ssl_state, uint8_t flags) SSLState *ssl_state)
{ {
SCEnter(); SCEnter();
@ -299,7 +289,7 @@ uint32_t DetectTlsSubjectInspectMpm(DetectEngineThreadCtx *det_ctx, Flow *f,
buffer = (uint8_t *)ssl_state->server_connp.cert0_subject; buffer = (uint8_t *)ssl_state->server_connp.cert0_subject;
buffer_len = strlen(ssl_state->server_connp.cert0_subject); buffer_len = strlen(ssl_state->server_connp.cert0_subject);
cnt = TlsSubjectPatternSearch(det_ctx, buffer, buffer_len, flags); cnt = TlsSubjectPatternSearch(det_ctx, buffer, buffer_len);
SCReturnUInt(cnt); SCReturnUInt(cnt);
} }
@ -323,7 +313,7 @@ int DetectEngineInspectTlsSubject(ThreadVars *tv, DetectEngineCtx *de_ctx,
uint64_t tx_id) uint64_t tx_id)
{ {
uint8_t *buffer; uint8_t *buffer;
uint16_t buffer_len; uint32_t buffer_len;
int cnt = 0; int cnt = 0;
SSLState *ssl_state = (SSLState *)alstate; SSLState *ssl_state = (SSLState *)alstate;

2
src/detect-tls-cert-issuer.h
Unescape Escape View File

@ -28,6 +28,6 @@
void DetectTlsIssuerRegister(void); void DetectTlsIssuerRegister(void);
uint32_t DetectTlsIssuerInspectMpm(DetectEngineThreadCtx *det_ctx, Flow *f, uint32_t DetectTlsIssuerInspectMpm(DetectEngineThreadCtx *det_ctx, Flow *f,
SSLState *ssl_state, uint8_t flags); SSLState *ssl_state);
#endif /* __DETECT_TLS_ISSUER_H__ */ #endif /* __DETECT_TLS_ISSUER_H__ */

2
src/detect-tls-cert-subject.h
Unescape Escape View File

@ -28,6 +28,6 @@
void DetectTlsSubjectRegister(void); void DetectTlsSubjectRegister(void);
uint32_t DetectTlsSubjectInspectMpm(DetectEngineThreadCtx *det_ctx, Flow *f, uint32_t DetectTlsSubjectInspectMpm(DetectEngineThreadCtx *det_ctx, Flow *f,
SSLState *ssl_state, uint8_t flags); SSLState *ssl_state);
#endif /* __DETECT_TLS_SUBJECT_H__ */ #endif /* __DETECT_TLS_SUBJECT_H__ */

3
src/detect-tls-sni.h
Unescape Escape View File

@ -27,7 +27,6 @@
#include "app-layer-ssl.h" #include "app-layer-ssl.h"
void DetectTlsSniRegister(void); void DetectTlsSniRegister(void);
uint32_t DetectTlsSniInspectMpm(DetectEngineThreadCtx *det_ctx, Flow *f, uint32_t DetectTlsSniInspectMpm(DetectEngineThreadCtx *det_ctx, SSLState *ssl_state);
SSLState *ssl_state, uint8_t flags);
#endif /* __DETECT_TLS_SNI_H__ */ #endif /* __DETECT_TLS_SNI_H__ */

6
src/detect.c
Unescape Escape View File

@ -1042,18 +1042,18 @@ static inline void DetectMpmPrefilter(DetectEngineCtx *de_ctx,
if (p->flowflags & FLOW_PKT_TOSERVER) { if (p->flowflags & FLOW_PKT_TOSERVER) {
if (det_ctx->sgh->flags & SIG_GROUP_HEAD_MPM_TLSSNI) { if (det_ctx->sgh->flags & SIG_GROUP_HEAD_MPM_TLSSNI) {
PACKET_PROFILING_DETECT_START(p, PROF_DETECT_MPM_TLSSNI); PACKET_PROFILING_DETECT_START(p, PROF_DETECT_MPM_TLSSNI);
DetectTlsSniInspectMpm(det_ctx, p->flow, alstate, flags); DetectTlsSniInspectMpm(det_ctx, alstate);
PACKET_PROFILING_DETECT_END(p, PROF_DETECT_MPM_TLSSNI); PACKET_PROFILING_DETECT_END(p, PROF_DETECT_MPM_TLSSNI);
} }
} else if (p->flowflags & FLOW_PKT_TOCLIENT) { } else if (p->flowflags & FLOW_PKT_TOCLIENT) {
if (det_ctx->sgh->flags & SIG_GROUP_HEAD_MPM_TLSISSUER) { if (det_ctx->sgh->flags & SIG_GROUP_HEAD_MPM_TLSISSUER) {
PACKET_PROFILING_DETECT_START(p, PROF_DETECT_MPM_TLSISSUER); PACKET_PROFILING_DETECT_START(p, PROF_DETECT_MPM_TLSISSUER);
DetectTlsIssuerInspectMpm(det_ctx, p->flow, alstate, flags); DetectTlsIssuerInspectMpm(det_ctx, p->flow, alstate);
PACKET_PROFILING_DETECT_END(p, PROF_DETECT_MPM_TLSISSUER); PACKET_PROFILING_DETECT_END(p, PROF_DETECT_MPM_TLSISSUER);
} }
if (det_ctx->sgh->flags & SIG_GROUP_HEAD_MPM_TLSSUBJECT) { if (det_ctx->sgh->flags & SIG_GROUP_HEAD_MPM_TLSSUBJECT) {
PACKET_PROFILING_DETECT_START(p, PROF_DETECT_MPM_TLSSUBJECT); PACKET_PROFILING_DETECT_START(p, PROF_DETECT_MPM_TLSSUBJECT);
DetectTlsSubjectInspectMpm(det_ctx, p->flow, alstate, flags); DetectTlsSubjectInspectMpm(det_ctx, p->flow, alstate);
PACKET_PROFILING_DETECT_END(p, PROF_DETECT_MPM_TLSSUBJECT); PACKET_PROFILING_DETECT_END(p, PROF_DETECT_MPM_TLSSUBJECT);
} }
} }

Write Preview
Loading…
Cancel
Save