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.

diff --git a/src/app-layer-ssl.h b/src/app-layer-ssl.h
index 14c2c0a592aa8c1855cd94785b4d7beb6994d940..160f70f26ff2325529f31ce1aa1dae5ae8240bf9 100644 (file)
--- 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 05567f8778f4b3f10b7cd28260a2a45be129b50c..614fc59f6511ec8453d03b76fb603e68e978b335 100644 (file)
--- 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 08049aa6d46223a76e992d756f4f954b5b3b71c3..31ddc19ed7014b6b765b8e0e0ef7c88aca0385bc 100644 (file)
--- 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;
     }