Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 06:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix up minor warnings in touched files

Browse source 
(cherry picked from commit 36af0591a6)
This commit is contained in:
Evan Typanski 2024-10-29 11:37:20 -04:00 • committed by Tim Wojtulewicz
parent e3845060dc
commit 107c0da15d
5 changed files with 19 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
CHANGES
View file

@ -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<unsigned char>` 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)

2
VERSION
View file

@ -1 +1 @@
7.0.3-12
7.0.3-14

2
src/DFA.cc
View file

@ -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"

2
src/DFA.h
View file

@ -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 {

3
src/analyzer/protocol/ssl/SSL.cc
View file

@ -6,7 +6,6 @@
#include <vector>
#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++;