From: Jason Ish <jason.ish@oisf.net>
Date: Wed, 23 Oct 2024 21:45:05 +0000 (-0600)
Subject: eve/tls: don't construct const from other const
X-Git-Tag: suricata-8.0.0-beta1~760
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a739d7623b7481ce26df730b2332389688199b2e;p=thirdparty%2Fsuricata.git

eve/tls: don't construct const from other const

Some compiler/platform combinations don't like creating one const from
another as it can't guarantee the other is defined, resulting in the
following compile error:

output-json-tls.c:102:5: error: initializer element is not constant
     BASIC_FIELDS |
     ^~~~~~~~~~~~

Fixes commit 377989df6cea13a23349a4c53cfb037c3ecd6d83
---

diff --git a/src/output-json-tls.c b/src/output-json-tls.c
index f84a8b9ac1..aa24b3380a 100644
--- a/src/output-json-tls.c
+++ b/src/output-json-tls.c
@@ -91,27 +91,27 @@ TlsFields tls_fields[] = {
 };
 
 // clang-format off
-static const uint64_t BASIC_FIELDS = \
-    LOG_TLS_FIELD_SUBJECT |
-    LOG_TLS_FIELD_ISSUER |
-    LOG_TLS_FIELD_SUBJECTALTNAME;
+#define BASIC_FIELDS                            \
+    (LOG_TLS_FIELD_SUBJECT |                    \
+     LOG_TLS_FIELD_ISSUER |                     \
+     LOG_TLS_FIELD_SUBJECTALTNAME)
 // clang-format on
 
 // clang-format off
-static const uint64_t EXTENDED_FIELDS = \
-    BASIC_FIELDS |
-    LOG_TLS_FIELD_VERSION |
-    LOG_TLS_FIELD_SERIAL |
-    LOG_TLS_FIELD_FINGERPRINT |
-    LOG_TLS_FIELD_NOTBEFORE |
-    LOG_TLS_FIELD_NOTAFTER |
-    LOG_TLS_FIELD_JA3 |
-    LOG_TLS_FIELD_JA3S |
-    LOG_TLS_FIELD_JA4 |
-    LOG_TLS_FIELD_CLIENT |
-    LOG_TLS_FIELD_CLIENT_ALPNS |
-    LOG_TLS_FIELD_SERVER_ALPNS |
-    LOG_TLS_FIELD_SNI;
+#define EXTENDED_FIELDS                         \
+    (BASIC_FIELDS |                             \
+     LOG_TLS_FIELD_VERSION |                    \
+     LOG_TLS_FIELD_SERIAL |                     \
+     LOG_TLS_FIELD_FINGERPRINT |                \
+     LOG_TLS_FIELD_NOTBEFORE |                  \
+     LOG_TLS_FIELD_NOTAFTER |                   \
+     LOG_TLS_FIELD_JA3 |                        \
+     LOG_TLS_FIELD_JA3S |                       \
+     LOG_TLS_FIELD_JA4 |                        \
+     LOG_TLS_FIELD_CLIENT |                     \
+     LOG_TLS_FIELD_CLIENT_ALPNS |               \
+     LOG_TLS_FIELD_SERVER_ALPNS |               \
+     LOG_TLS_FIELD_SNI)
 // clang-format on
 
 typedef struct OutputTlsCtx_ {