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

tls: change flag checking in SSLParserTest23

Browse Source 
Change flag checking in SSLParserTest23 to check each flag individually
to enable adding more flags without the test failing.
pull/2081/head
Mats Klepsland 9 years ago committed by Victor Julien
parent 47a4daeeb8
commit 663273a31e
1 changed files with 32 additions and 23 deletions
Show Stats Download Patch File Download Diff File

55
src/app-layer-ssl.c
Unescape Escape View File

@ -3898,9 +3898,9 @@ static int SSLParserTest23(void)
goto end;
}
if (app_state->flags !=
(SSL_AL_FLAG_STATE_CLIENT_HELLO | SSL_AL_FLAG_SSL_CLIENT_HS |
SSL_AL_FLAG_SSL_NO_SESSION_ID)) {
if ((app_state->flags & SSL_AL_FLAG_STATE_CLIENT_HELLO) == 0 ||
(app_state->flags & SSL_AL_FLAG_SSL_CLIENT_HS) == 0 ||
(app_state->flags & SSL_AL_FLAG_SSL_NO_SESSION_ID) == 0) {
printf("flags not set\n");
result = 0;
goto end;
@ -3932,9 +3932,10 @@ static int SSLParserTest23(void)
goto end;
}
if (app_state->flags !=
(SSL_AL_FLAG_STATE_CLIENT_HELLO | SSL_AL_FLAG_SSL_CLIENT_HS |
SSL_AL_FLAG_SSL_NO_SESSION_ID | SSL_AL_FLAG_STATE_SERVER_HELLO)) {
if ((app_state->flags & SSL_AL_FLAG_STATE_CLIENT_HELLO) == 0 ||
(app_state->flags & SSL_AL_FLAG_SSL_CLIENT_HS) == 0 ||
(app_state->flags & SSL_AL_FLAG_SSL_NO_SESSION_ID) == 0 ||
(app_state->flags & SSL_AL_FLAG_STATE_SERVER_HELLO) == 0) {
printf("flags not set\n");
result = 0;
goto end;
@ -3967,11 +3968,13 @@ static int SSLParserTest23(void)
goto end;
}
if (app_state->flags !=
(SSL_AL_FLAG_STATE_CLIENT_HELLO | SSL_AL_FLAG_SSL_CLIENT_HS |
SSL_AL_FLAG_SSL_NO_SESSION_ID | SSL_AL_FLAG_STATE_SERVER_HELLO |
SSL_AL_FLAG_STATE_CLIENT_KEYX | SSL_AL_FLAG_CLIENT_CHANGE_CIPHER_SPEC |
SSL_AL_FLAG_CHANGE_CIPHER_SPEC)) {
if ((app_state->flags & SSL_AL_FLAG_STATE_CLIENT_HELLO) == 0 ||
(app_state->flags & SSL_AL_FLAG_SSL_CLIENT_HS) == 0 ||
(app_state->flags & SSL_AL_FLAG_SSL_NO_SESSION_ID) == 0 ||
(app_state->flags & SSL_AL_FLAG_STATE_SERVER_HELLO) == 0 ||
(app_state->flags & SSL_AL_FLAG_STATE_CLIENT_KEYX) == 0 ||
(app_state->flags & SSL_AL_FLAG_CLIENT_CHANGE_CIPHER_SPEC) == 0 ||
(app_state->flags & SSL_AL_FLAG_CHANGE_CIPHER_SPEC) == 0) {
printf("flags not set\n");
result = 0;
goto end;
@ -4004,12 +4007,15 @@ static int SSLParserTest23(void)
goto end;
}
if (app_state->flags !=
(SSL_AL_FLAG_STATE_CLIENT_HELLO | SSL_AL_FLAG_SSL_CLIENT_HS |
SSL_AL_FLAG_SSL_NO_SESSION_ID | SSL_AL_FLAG_STATE_SERVER_HELLO |
SSL_AL_FLAG_STATE_CLIENT_KEYX | SSL_AL_FLAG_CLIENT_CHANGE_CIPHER_SPEC |
SSL_AL_FLAG_CHANGE_CIPHER_SPEC | SSL_AL_FLAG_SERVER_CHANGE_CIPHER_SPEC |
SSL_AL_FLAG_CHANGE_CIPHER_SPEC)) {
if ((app_state->flags & SSL_AL_FLAG_STATE_CLIENT_HELLO) == 0 ||
(app_state->flags & SSL_AL_FLAG_SSL_CLIENT_HS) == 0 ||
(app_state->flags & SSL_AL_FLAG_SSL_NO_SESSION_ID) == 0 ||
(app_state->flags & SSL_AL_FLAG_STATE_SERVER_HELLO) == 0 ||
(app_state->flags & SSL_AL_FLAG_STATE_CLIENT_KEYX) == 0 ||
(app_state->flags & SSL_AL_FLAG_CLIENT_CHANGE_CIPHER_SPEC) == 0 ||
(app_state->flags & SSL_AL_FLAG_CHANGE_CIPHER_SPEC) == 0 ||
(app_state->flags & SSL_AL_FLAG_SERVER_CHANGE_CIPHER_SPEC) == 0 ||
(app_state->flags & SSL_AL_FLAG_CHANGE_CIPHER_SPEC) == 0) {
printf("flags not set\n");
result = 0;
goto end;
@ -4040,12 +4046,15 @@ static int SSLParserTest23(void)
goto end;
}
if (app_state->flags !=
(SSL_AL_FLAG_STATE_CLIENT_HELLO | SSL_AL_FLAG_SSL_CLIENT_HS |
SSL_AL_FLAG_SSL_NO_SESSION_ID | SSL_AL_FLAG_STATE_SERVER_HELLO |
SSL_AL_FLAG_STATE_CLIENT_KEYX | SSL_AL_FLAG_CLIENT_CHANGE_CIPHER_SPEC |
SSL_AL_FLAG_CHANGE_CIPHER_SPEC | SSL_AL_FLAG_SERVER_CHANGE_CIPHER_SPEC |
SSL_AL_FLAG_CHANGE_CIPHER_SPEC)) {
if ((app_state->flags & SSL_AL_FLAG_STATE_CLIENT_HELLO) == 0 ||
(app_state->flags & SSL_AL_FLAG_SSL_CLIENT_HS) == 0 ||
(app_state->flags & SSL_AL_FLAG_SSL_NO_SESSION_ID) == 0 ||
(app_state->flags & SSL_AL_FLAG_STATE_SERVER_HELLO) == 0 ||
(app_state->flags & SSL_AL_FLAG_STATE_CLIENT_KEYX) == 0 ||
(app_state->flags & SSL_AL_FLAG_CLIENT_CHANGE_CIPHER_SPEC) == 0 ||
(app_state->flags & SSL_AL_FLAG_CHANGE_CIPHER_SPEC) == 0 ||
(app_state->flags & SSL_AL_FLAG_SERVER_CHANGE_CIPHER_SPEC) == 0 ||
(app_state->flags & SSL_AL_FLAG_CHANGE_CIPHER_SPEC) == 0) {
printf("flags not set\n");
result = 0;
goto end;

Write Preview
Loading…
Cancel
Save