From c6dfadd4b4423cb6b9c575f171cfd076f106c9c6 Mon Sep 17 00:00:00 2001 From: Philippe Antoine Date: Tue, 6 May 2025 13:43:14 +0200 Subject: [PATCH] ja4: check more ifdef HAVE_JA4 Avoids a unused macro warning --- src/app-layer-ssl.c | 3 +++ src/output-json-tls.c | 1 + 2 files changed, 4 insertions(+) diff --git a/src/app-layer-ssl.c b/src/app-layer-ssl.c index 6ec0adbf23..9df0999c89 100644 --- a/src/app-layer-ssl.c +++ b/src/app-layer-ssl.c @@ -186,7 +186,9 @@ enum { /* JA3 and JA4 fingerprints are disabled by default */ #define SSL_CONFIG_DEFAULT_JA3 0 +#ifdef HAVE_JA4 #define SSL_CONFIG_DEFAULT_JA4 0 +#endif enum SslConfigEncryptHandling { SSL_CNF_ENC_HANDLE_TRACK_ONLY = 0, /**< disable raw content, continue tracking */ @@ -3366,6 +3368,7 @@ void SSLEnableJA3(void) */ void SSLEnableJA4(void) { + // only caller has #ifdef HAVE_JA4 if (g_disable_hashing || ssl_config.disable_ja4) { return; } diff --git a/src/output-json-tls.c b/src/output-json-tls.c index 7c26c6507e..7c68f7864e 100644 --- a/src/output-json-tls.c +++ b/src/output-json-tls.c @@ -83,6 +83,7 @@ TlsFields tls_fields[] = { { "client", LOG_TLS_FIELD_CLIENT }, { "client_certificate", LOG_TLS_FIELD_CLIENT_CERT }, { "client_chain", LOG_TLS_FIELD_CLIENT_CHAIN }, + // accept if as nop if we do not HAVE_JA4 { "ja4", LOG_TLS_FIELD_JA4 }, { "subjectaltname", LOG_TLS_FIELD_SUBJECTALTNAME }, { "client_alpns", LOG_TLS_FIELD_CLIENT_ALPNS },