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

some naming changes in ssl parser and ssl related keywords

Browse Source
remotes/origin/master-1.1.x
Anoop Saldanha 14 years ago committed by Victor Julien
parent 4c570777c4
commit 7a2046328c
4 changed files with 409 additions and 412 deletions
Show Stats Download Patch File Download Diff File

748
src/app-layer-ssl.c
View File

File diff suppressed because it is too large Load Diff

10
src/app-layer-ssl.h
Unescape Escape View File

@ -56,13 +56,13 @@ enum {
*
* Structure to store the SSL state values.
*/
typedef struct SslState_ {
typedef struct SSLState_ {
/* record length */
uint32_t record_length;
/* record length's length for SSLv2 */
uint32_t record_lengths_length;
/* Flags to indicate the current SSL session state */
/* holds some state flags we need */
uint32_t flags;
uint16_t client_version;
@ -85,9 +85,9 @@ typedef struct SslState_ {
/* sslv2 client hello session id length */
uint16_t session_id_length;
} SslState;
} SSLState;
void RegisterSslParsers(void);
void SslParserRegisterTests(void);
void RegisterSSLParsers(void);
void SSLParserRegisterTests(void);
#endif /* __APP_LAYER_SSL_H__ */

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

@ -44,7 +44,6 @@
#include "util-unittest-helper.h"
#include "app-layer.h"
#include "app-layer-tls.h"
#include "detect-ssl-version.h"
@ -121,7 +120,7 @@ int DetectSslVersionMatch(ThreadVars *t, DetectEngineThreadCtx *det_ctx,
SCEnter();
DetectSslVersionData *ssl = (DetectSslVersionData *)m->ctx;
SslState *app_state = (SslState *)state;
SSLState *app_state = (SSLState *)state;
if (app_state == NULL) {
SCLogDebug("no app state, no match");
SCReturnInt(0);
@ -472,7 +471,7 @@ static int DetectSslVersionTestDetect01(void)
goto end;
}
SslState *app_state = f.aldata[AlpGetStateIdx(ALPROTO_TLS)];
SSLState *app_state = f.aldata[AlpGetStateIdx(ALPROTO_TLS)];
if (app_state == NULL) {
printf("no ssl state: ");
goto end;
@ -589,7 +588,7 @@ static int DetectSslVersionTestDetect02(void)
goto end;
}
SslState *app_state = f.aldata[AlpGetStateIdx(ALPROTO_TLS)];
SSLState *app_state = f.aldata[AlpGetStateIdx(ALPROTO_TLS)];
if (app_state == NULL) {
printf("no ssl state: ");
goto end;
@ -720,7 +719,7 @@ static int DetectSslVersionTestDetect03(void)
goto end;
}
SslState *app_state = f.aldata[AlpGetStateIdx(ALPROTO_TLS)];
SSLState *app_state = f.aldata[AlpGetStateIdx(ALPROTO_TLS)];
if (app_state == NULL) {
printf("no ssl state: ");
goto end;

54
src/detect-tls-version.c
Unescape Escape View File

@ -45,7 +45,7 @@
#include "app-layer.h"
#include "app-layer-tls.h"
#include "app-layer-ssl.h"
#include "detect-tls-version.h"
#include "stream-tcp.h"
@ -115,8 +115,8 @@ int DetectTlsVersionMatch (ThreadVars *t, DetectEngineThreadCtx *det_ctx, Flow *
SCEnter();
DetectTlsVersionData *tls_data = (DetectTlsVersionData *)m->ctx;
SslState *tls_state = (SslState *)state;
if (tls_state == NULL) {
SSLState *ssl_state = (SSLState *)state;
if (ssl_state == NULL) {
SCLogDebug("no tls state, no match");
SCReturnInt(0);
}
@ -126,12 +126,12 @@ int DetectTlsVersionMatch (ThreadVars *t, DetectEngineThreadCtx *det_ctx, Flow *
SCLogDebug("looking for tls_data->ver 0x%02X (flags 0x%02X)", tls_data->ver, flags);
if (flags & STREAM_TOCLIENT) {
SCLogDebug("server (toclient) version is 0x%02X", tls_state->server_version);
if (tls_data->ver == tls_state->server_version)
SCLogDebug("server (toclient) version is 0x%02X", ssl_state->server_version);
if (tls_data->ver == ssl_state->server_version)
ret = 1;
} else if (flags & STREAM_TOSERVER) {
SCLogDebug("client (toserver) version is 0x%02X", tls_state->client_version);
if (tls_data->ver == tls_state->client_version)
SCLogDebug("client (toserver) version is 0x%02X", ssl_state->client_version);
if (tls_data->ver == ssl_state->client_version)
ret = 1;
}
SCMutexUnlock(&f->m);
@ -382,24 +382,24 @@ static int DetectTlsVersionTestDetect01(void) {
goto end;
}
SslState *tls_state = f.aldata[AlpGetStateIdx(ALPROTO_TLS)];
if (tls_state == NULL) {
SSLState *ssl_state = f.aldata[AlpGetStateIdx(ALPROTO_TLS)];
if (ssl_state == NULL) {
printf("no tls state: ");
goto end;
}
if (tls_state->client_content_type != 0x16) {
printf("expected content_type %" PRIu8 ", got %" PRIu8 ": ", 0x16, tls_state->client_content_type);
if (ssl_state->client_content_type != 0x16) {
printf("expected content_type %" PRIu8 ", got %" PRIu8 ": ", 0x16, ssl_state->client_content_type);
goto end;
}
if (tls_state->client_version != TLS_VERSION_10) {
printf("expected version %04" PRIu16 ", got %04" PRIu16 ": ", TLS_VERSION_10, tls_state->client_version);
if (ssl_state->client_version != TLS_VERSION_10) {
printf("expected version %04" PRIu16 ", got %04" PRIu16 ": ", TLS_VERSION_10, ssl_state->client_version);
goto end;
}
SCLogDebug("tls_state is at %p, tls_state->server_version 0x%02X tls_state->client_version 0x%02X",
tls_state, tls_state->server_version, tls_state->client_version);
SCLogDebug("ssl_state is at %p, ssl_state->server_version 0x%02X ssl_state->client_version 0x%02X",
ssl_state, ssl_state->server_version, ssl_state->client_version);
/* do detect */
SigMatchSignatures(&th_v, de_ctx, det_ctx, p);
@ -497,19 +497,19 @@ static int DetectTlsVersionTestDetect02(void) {
goto end;
}
SslState *tls_state = f.aldata[AlpGetStateIdx(ALPROTO_TLS)];
if (tls_state == NULL) {
SSLState *ssl_state = f.aldata[AlpGetStateIdx(ALPROTO_TLS)];
if (ssl_state == NULL) {
printf("no tls state: ");
goto end;
}
if (tls_state->client_content_type != 0x16) {
printf("expected content_type %" PRIu8 ", got %" PRIu8 ": ", 0x16, tls_state->client_content_type);
if (ssl_state->client_content_type != 0x16) {
printf("expected content_type %" PRIu8 ", got %" PRIu8 ": ", 0x16, ssl_state->client_content_type);
goto end;
}
if (tls_state->client_version != TLS_VERSION_10) {
printf("expected version %04" PRIu16 ", got %04" PRIu16 ": ", TLS_VERSION_10, tls_state->client_version);
if (ssl_state->client_version != TLS_VERSION_10) {
printf("expected version %04" PRIu16 ", got %04" PRIu16 ": ", TLS_VERSION_10, ssl_state->client_version);
goto end;
}
@ -629,19 +629,19 @@ static int DetectTlsVersionTestDetect03(void) {
goto end;
}
SslState *tls_state = f.aldata[AlpGetStateIdx(ALPROTO_TLS)];
if (tls_state == NULL) {
SSLState *ssl_state = f.aldata[AlpGetStateIdx(ALPROTO_TLS)];
if (ssl_state == NULL) {
printf("no tls state: ");
goto end;
}
if (tls_state->client_content_type != 0x16) {
printf("expected content_type %" PRIu8 ", got %" PRIu8 ": ", 0x16, tls_state->client_content_type);
if (ssl_state->client_content_type != 0x16) {
printf("expected content_type %" PRIu8 ", got %" PRIu8 ": ", 0x16, ssl_state->client_content_type);
goto end;
}
if (tls_state->client_version != TLS_VERSION_10) {
printf("expected version %04" PRIu16 ", got %04" PRIu16 ": ", TLS_VERSION_10, tls_state->client_version);
if (ssl_state->client_version != TLS_VERSION_10) {
printf("expected version %04" PRIu16 ", got %04" PRIu16 ": ", TLS_VERSION_10, ssl_state->client_version);
goto end;
}

Write Preview
Loading…
Cancel
Save