From d9ddae4592069592ecd1c0505abb874959951bd6 Mon Sep 17 00:00:00 2001 From: Mats Klepsland Date: Thu, 22 Mar 2018 13:17:17 +0100 Subject: [PATCH] tls: replace variable in header file with TAILQ_EMPTY() Use TAILQ_EMPTY to check if a certificate exists instead of setting two variables in the app-layer-ssl header file for that purpose only. --- src/app-layer-ssl.h | 3 --- src/log-tlsstore.c | 2 +- src/output-json-tls.c | 6 ++---- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/app-layer-ssl.h b/src/app-layer-ssl.h index 14c2c0a59..160f70f26 100644 --- a/src/app-layer-ssl.h +++ b/src/app-layer-ssl.h @@ -166,9 +166,6 @@ typedef struct SSLStateConnp_ { /* ssl server name indication extension */ char *sni; - uint8_t *cert_input; - uint32_t cert_input_len; - TAILQ_HEAD(, SSLCertsChain_) certs; uint32_t cert_log_flag; diff --git a/src/log-tlsstore.c b/src/log-tlsstore.c index 05567f877..614fc59f6 100644 --- a/src/log-tlsstore.c +++ b/src/log-tlsstore.c @@ -105,7 +105,7 @@ static void LogTlsLogPem(LogTlsStoreLogThread *aft, const Packet *p, SSLState *s uint8_t *ptmp; SSLCertsChain *cert; - if ((state->server_connp.cert_input == NULL) || (state->server_connp.cert_input_len == 0)) + if (TAILQ_EMPTY(&state->server_connp.certs)) SCReturn; CreateFileName(p, state, filename); diff --git a/src/output-json-tls.c b/src/output-json-tls.c index 08049aa6d..31ddc19ed 100644 --- a/src/output-json-tls.c +++ b/src/output-json-tls.c @@ -244,8 +244,7 @@ static void JsonTlsLogJa3(json_t *js, SSLState *ssl_state) static void JsonTlsLogCertificate(json_t *js, SSLState *ssl_state) { - if ((ssl_state->server_connp.cert_input == NULL) || - (ssl_state->server_connp.cert_input_len == 0)) { + if (TAILQ_EMPTY(&ssl_state->server_connp.certs)) { return; } @@ -264,8 +263,7 @@ static void JsonTlsLogCertificate(json_t *js, SSLState *ssl_state) static void JsonTlsLogChain(json_t *js, SSLState *ssl_state) { - if ((ssl_state->server_connp.cert_input == NULL) || - (ssl_state->server_connp.cert_input_len == 0)) { + if (TAILQ_EMPTY(&ssl_state->server_connp.certs)) { return; } -- 2.47.3