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

fix detect-ssl-version.c unittests to accomodate new changes

Browse Source
remotes/origin/master-1.1.x
Anoop Saldanha 15 years ago committed by Victor Julien
parent 95f9f2c28d
commit 9845718138
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File

23
src/detect-ssl-version.c
Unescape Escape View File

@ -398,7 +398,8 @@ int DetectSslVersionTestParse03(void) {
#include "stream-tcp-reassemble.h" #include "stream-tcp-reassemble.h"
/** \test Send a get request in three chunks + more data. */ /** \test Send a get request in three chunks + more data. */
static int DetectSslVersionTestDetect01(void){ static int DetectSslVersionTestDetect01(void)
{
int result = 0; int result = 0;
Flow f; Flow f;
uint8_t sslbuf1[] = { 0x16 }; uint8_t sslbuf1[] = { 0x16 };
@ -426,7 +427,7 @@ static int DetectSslVersionTestDetect01(void){
p->flow = &f; p->flow = &f;
p->flowflags |= FLOW_PKT_TOSERVER; p->flowflags |= FLOW_PKT_TOSERVER;
p->flowflags |= FLOW_PKT_ESTABLISHED; p->flowflags |= FLOW_PKT_ESTABLISHED;
p->flags |= PKT_HAS_FLOW; p->flags |= PKT_HAS_FLOW | PKT_STREAM_EST;
f.alproto = ALPROTO_TLS; f.alproto = ALPROTO_TLS;
StreamTcpInitConfig(TRUE); StreamTcpInitConfig(TRUE);
@ -514,7 +515,8 @@ end:
return result; return result;
} }
static int DetectSslVersionTestDetect02(void){ static int DetectSslVersionTestDetect02(void)
{
int result = 0; int result = 0;
Flow f; Flow f;
uint8_t sslbuf1[] = { 0x16 }; uint8_t sslbuf1[] = { 0x16 };
@ -542,7 +544,7 @@ static int DetectSslVersionTestDetect02(void){
p->flow = &f; p->flow = &f;
p->flowflags |= FLOW_PKT_TOSERVER; p->flowflags |= FLOW_PKT_TOSERVER;
p->flowflags |= FLOW_PKT_ESTABLISHED; p->flowflags |= FLOW_PKT_ESTABLISHED;
p->flags |= PKT_HAS_FLOW; p->flags |= PKT_HAS_FLOW | PKT_STREAM_EST;
f.alproto = ALPROTO_TLS; f.alproto = ALPROTO_TLS;
StreamTcpInitConfig(TRUE); StreamTcpInitConfig(TRUE);
@ -616,19 +618,17 @@ static int DetectSslVersionTestDetect02(void){
end: end:
SigGroupCleanup(de_ctx); SigGroupCleanup(de_ctx);
SigCleanSignatures(de_ctx); SigCleanSignatures(de_ctx);
DetectEngineThreadCtxDeinit(&th_v, (void *)det_ctx); DetectEngineThreadCtxDeinit(&th_v, (void *)det_ctx);
DetectEngineCtxFree(de_ctx); DetectEngineCtxFree(de_ctx);
FlowL7DataPtrFree(&f); FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE); StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f); FLOW_DESTROY(&f);
UTHFreePackets(&p, 1); UTHFreePackets(&p, 1);
return result; return result;
} }
static int DetectSslVersionTestDetect03(void){ static int DetectSslVersionTestDetect03(void)
{
DetectEngineCtx *de_ctx = NULL; DetectEngineCtx *de_ctx = NULL;
int result = 0; int result = 0;
Flow f; Flow f;
@ -658,7 +658,7 @@ static int DetectSslVersionTestDetect03(void){
p->flow = &f; p->flow = &f;
p->flowflags |= FLOW_PKT_TOSERVER; p->flowflags |= FLOW_PKT_TOSERVER;
p->flowflags |= FLOW_PKT_ESTABLISHED; p->flowflags |= FLOW_PKT_ESTABLISHED;
p->flags |= PKT_HAS_FLOW; p->flags |= PKT_HAS_FLOW | PKT_STREAM_EST;
f.alproto = ALPROTO_TLS; f.alproto = ALPROTO_TLS;
f.proto = p->proto; f.proto = p->proto;
@ -766,7 +766,8 @@ end:
/** /**
* \brief this function registers unit tests for DetectSslVersion * \brief this function registers unit tests for DetectSslVersion
*/ */
void DetectSslVersionRegisterTests(void) { void DetectSslVersionRegisterTests(void)
{
#ifdef UNITTESTS /* UNITTESTS */ #ifdef UNITTESTS /* UNITTESTS */
UtRegisterTest("DetectSslVersionTestParse01", DetectSslVersionTestParse01, 1); UtRegisterTest("DetectSslVersionTestParse01", DetectSslVersionTestParse01, 1);
UtRegisterTest("DetectSslVersionTestParse02", DetectSslVersionTestParse02, 1); UtRegisterTest("DetectSslVersionTestParse02", DetectSslVersionTestParse02, 1);
@ -775,4 +776,6 @@ void DetectSslVersionRegisterTests(void) {
UtRegisterTest("DetectSslVersionTestDetect02", DetectSslVersionTestDetect02, 1); UtRegisterTest("DetectSslVersionTestDetect02", DetectSslVersionTestDetect02, 1);
UtRegisterTest("DetectSslVersionTestDetect03", DetectSslVersionTestDetect03, 1); UtRegisterTest("DetectSslVersionTestDetect03", DetectSslVersionTestDetect03, 1);
#endif /* UNITTESTS */ #endif /* UNITTESTS */
return;
} }

Write Preview
Loading…
Cancel
Save