From 663273a31e0903ad6f58849d4e1b4ac0052277a5 Mon Sep 17 00:00:00 2001 From: Mats Klepsland Date: Wed, 27 Apr 2016 10:17:15 +0200 Subject: [PATCH] tls: change flag checking in SSLParserTest23 Change flag checking in SSLParserTest23 to check each flag individually to enable adding more flags without the test failing. --- src/app-layer-ssl.c | 55 ++++++++++++++++++++++++++------------------- 1 file changed, 32 insertions(+), 23 deletions(-) diff --git a/src/app-layer-ssl.c b/src/app-layer-ssl.c index 057ae2a155..2883707373 100644 --- a/src/app-layer-ssl.c +++ b/src/app-layer-ssl.c @@ -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; -- 2.47.3