diff --git a/CHANGES b/CHANGES index 59d61d1bcd..e24426a505 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,19 @@ +7.0.3-14 | 2024-11-14 11:52:34 -0700 + + * Fix up minor warnings in touched files (Evan Typanski, Corelight) + + (cherry picked from commit 36af0591a6f2c7270c68deaee4c4d733fa4086b1) + + * Fix Clang 19 deprecation failure (Evan Typanski, Corelight) + + Clang 19 with libc++ started failing to compile because the default + implementation of `std::char_traits` was removed, making uses of + `std::char_traits` invalid. This was more of used for + convenience before, but it should be roughly the same behavior with + `char`. + + (cherry picked from commit 985f4f7c725ae1a9f85dbc112e5bc340a34a034b) + 7.0.3-12 | 2024-11-14 11:33:09 -0700 * GH-3978: Bump zeekjs to 0.12.1 (Arne Welzel, Corelight) diff --git a/VERSION b/VERSION index bee16bfcd8..49c645ee23 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -7.0.3-12 +7.0.3-14 diff --git a/src/DFA.cc b/src/DFA.cc index c2ac56b616..9de8c025c9 100644 --- a/src/DFA.cc +++ b/src/DFA.cc @@ -2,8 +2,6 @@ #include "zeek/DFA.h" -#include "zeek/zeek-config.h" - #include "zeek/Desc.h" #include "zeek/EquivClass.h" #include "zeek/Hash.h" diff --git a/src/DFA.h b/src/DFA.h index e44fa05b22..7944a6053f 100644 --- a/src/DFA.h +++ b/src/DFA.h @@ -18,7 +18,7 @@ class DFA_Machine; // Transitions to the uncomputed state indicate that we haven't yet // computed the state to go to. -#define DFA_UNCOMPUTED_STATE -2 +#define DFA_UNCOMPUTED_STATE (-2) #define DFA_UNCOMPUTED_STATE_PTR ((DFA_State*)DFA_UNCOMPUTED_STATE) class DFA_State : public Obj { diff --git a/src/analyzer/protocol/ssl/SSL.cc b/src/analyzer/protocol/ssl/SSL.cc index 8a4718dab7..b6a3043a21 100644 --- a/src/analyzer/protocol/ssl/SSL.cc +++ b/src/analyzer/protocol/ssl/SSL.cc @@ -6,7 +6,6 @@ #include #include "zeek/Reporter.h" -#include "zeek/analyzer/Manager.h" #include "zeek/analyzer/protocol/ssl/events.bif.h" #include "zeek/analyzer/protocol/ssl/ssl_pac.h" #include "zeek/analyzer/protocol/ssl/tls-handshake_pac.h" @@ -276,7 +275,7 @@ bool SSL_Analyzer::TryDecryptApplicationData(int len, const u_char* data, bool i // FIXME: should we change types here? const u_char* encrypted = data; - size_t encrypted_len = len; + int encrypted_len = len; if ( is_orig ) c_seq++;