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.
pull/3317/head
Mats Klepsland 8 years ago committed by Victor Julien
parent f40fc0293b
commit d9ddae4592

@ -166,9 +166,6 @@ typedef struct SSLStateConnp_ {
/* ssl server name indication extension */ /* ssl server name indication extension */
char *sni; char *sni;
uint8_t *cert_input;
uint32_t cert_input_len;
TAILQ_HEAD(, SSLCertsChain_) certs; TAILQ_HEAD(, SSLCertsChain_) certs;
uint32_t cert_log_flag; uint32_t cert_log_flag;

@ -105,7 +105,7 @@ static void LogTlsLogPem(LogTlsStoreLogThread *aft, const Packet *p, SSLState *s
uint8_t *ptmp; uint8_t *ptmp;
SSLCertsChain *cert; SSLCertsChain *cert;
if ((state->server_connp.cert_input == NULL) || (state->server_connp.cert_input_len == 0)) if (TAILQ_EMPTY(&state->server_connp.certs))
SCReturn; SCReturn;
CreateFileName(p, state, filename); CreateFileName(p, state, filename);

@ -244,8 +244,7 @@ static void JsonTlsLogJa3(json_t *js, SSLState *ssl_state)
static void JsonTlsLogCertificate(json_t *js, SSLState *ssl_state) static void JsonTlsLogCertificate(json_t *js, SSLState *ssl_state)
{ {
if ((ssl_state->server_connp.cert_input == NULL) || if (TAILQ_EMPTY(&ssl_state->server_connp.certs)) {
(ssl_state->server_connp.cert_input_len == 0)) {
return; return;
} }
@ -264,8 +263,7 @@ static void JsonTlsLogCertificate(json_t *js, SSLState *ssl_state)
static void JsonTlsLogChain(json_t *js, SSLState *ssl_state) static void JsonTlsLogChain(json_t *js, SSLState *ssl_state)
{ {
if ((ssl_state->server_connp.cert_input == NULL) || if (TAILQ_EMPTY(&ssl_state->server_connp.certs)) {
(ssl_state->server_connp.cert_input_len == 0)) {
return; return;
} }

Loading…
Cancel
Save