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
16243 commits 387 branches 195 tags 255 MiB
Commit graph

16243 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tim Wojtulewicz
3492981a29 Update CHANGES, VERSION, and NEWS for the v6.2.1 release 2024-05-16 10:12:06 -07:00
Tim Wojtulewicz
ac821a1ed0 CI: Change spicy-head test to match master 2024-05-16 09:37:42 -07:00
Tim Wojtulewicz
e356d92fd0 Merge remote-tracking branch 'origin/topic/timw/spicy-1.10.1-bump-for-6.2.1' into release/6.2 
* origin/topic/timw/spicy-1.10.1-bump-for-6.2.1:
  Bump spicy submodule to v1.10.1
 2024-05-15 15:02:29 -07:00
Tim Wojtulewicz
b3adc44a0c Update docs submodule [nomail] [skip ci] 2024-05-15 15:02:08 -07:00
Tim Wojtulewicz
f111f773ae CI: Disable spicy_head task on release branches 2024-05-15 15:01:56 -07:00
Tim Wojtulewicz
cf96dbe5d3 Updating CHANGES and VERSION. 2024-05-14 16:51:21 -07:00
Tim Wojtulewicz
86f1c3898b Update broker submodule [nomail] 2024-05-14 16:44:29 -07:00
Christian Kreibich
7e1d540831 Merge branch 'topic/christian/localversion' 
* topic/christian/localversion:
  Parse and store localversion string
  Remove commented-out code
  Check ZEEK_VERSION_LOCAL for dashes
  Update version string btests for localversion
  Modify version parsing for localversion
  Update version used by spicyz
  Update build script
  Support for configurable localversion

(cherry picked from commit d09584e52e)
 2024-05-14 16:34:06 -07:00
Tim Wojtulewicz
946ea4a091 Merge remote-tracking branch 'pbcullen/topic/pbcullen/remove_exclude' 
* pbcullen/topic/pbcullen/remove_exclude:
  Update core.pcap.filter-warning baseline
  Add PacketFilter::remove_exclude function

(cherry picked from commit d566961da5)
 2024-05-14 16:33:40 -07:00
Tim Wojtulewicz
3e420c049d Merge remote-tracking branch 'pbcullen/topic/pbcullen/shadow-file-handling' 
* pbcullen/topic/pbcullen/shadow-file-handling:
  reformat changes
  Gracefully handle empty/missing shadow file

(cherry picked from commit ad6d70d4e6)
 2024-05-14 16:32:54 -07:00
Christian Kreibich
aa03c0ec06 Merge branch 'topic/christian/3671-fix-icmp-caplen-violations' 
* topic/christian/3671-fix-icmp-caplen-violations:
  Factor in caplens in ICMPAnalyzer::DeliverPacket length calculations

(cherry picked from commit 7fdbb73511)
 2024-05-14 16:32:40 -07:00
Tim Wojtulewicz
5a9e597cb5 Bump spicy submodule to v1.10.1 2024-05-14 16:31:15 -07:00
Tim Wojtulewicz
a167f0a145 CI: Use macOS Sonoma xcode VM to fix problem with missing tools 2024-05-14 16:30:51 -07:00
Tim Wojtulewicz
72187174d2 CI: Fix python installations on macOS 2024-05-14 16:30:44 -07:00
Tim Wojtulewicz
56fac2d632 Bump commit hash for zeek-testing-cluster 2024-05-14 16:30:37 -07:00
Tim Wojtulewicz
e90c6e4d0b Updating CHANGES and VERSION. 2024-03-13 11:02:11 -07:00
Tim Wojtulewicz
bb686e7f2b Update docs submodule [nomail] [skip ci] 2024-03-13 10:53:51 -07:00
Tim Wojtulewicz
242cb3ed91 Merge remote-tracking branch 'origin/topic/christian/news-contributors' 
* origin/topic/christian/news-contributors:
  Add community contributions for the 6.2 timeframe to NEWS. [skip ci]

(cherry picked from commit 6fa34c202f)
 2024-03-13 10:19:42 -07:00
Tim Wojtulewicz
4902daa523 Merge remote-tracking branch 'origin/topic/bbannier/bump-spicy-6.2' into release/6.2 
* origin/topic/bbannier/bump-spicy-6.2:
  Bump Spicy to latest release.
 2024-03-04 13:11:25 -07:00
Tim Wojtulewicz
ccdab84dad Move bifcl/binpac/broker to zeek-6.2 release branches 2024-03-04 13:04:32 -07:00
Tim Wojtulewicz
011ca37d63 Merge remote-tracking branch 'origin/topic/timw/ci-freebsd-13' 
* origin/topic/timw/ci-freebsd-13:
  CI: Bump FreeBSD 13 build to 13.3

(cherry picked from commit ce8310ec89)
 2024-03-04 12:47:23 -07:00
Arne Welzel
6b6942f9b2 Merge remote-tracking branch 'origin/topic/awelzel/fix-assert-cond-twice' 
* origin/topic/awelzel/fix-assert-cond-twice:
  Stmt: Fix assert evaluating cond twice

(cherry picked from commit 6867eda621)
 2024-03-04 12:47:02 -07:00
Benjamin Bannier
5e264d3987 Bump Spicy to latest release. 2024-03-04 19:26:33 +01:00
Arne Welzel
1d381b264b Merge remote-tracking branch 'origin/topic/awelzel/zeekjs-0.12.0' 
* origin/topic/awelzel/zeekjs-0.12.0:
  Bump zeekjs to 0.12.0

(cherry picked from commit 724daa2792)
 2024-02-28 09:59:13 -07:00
Tim Wojtulewicz
f2ab820c88 Merge remote-tracking branch 'origin/topic/johanna/update-tls-ca-stuff' 
* origin/topic/johanna/update-tls-ca-stuff:
  Update Mozilla CA and Google CT list and related tests.

(cherry picked from commit c315202ece)
 2024-02-26 11:13:42 -07:00
Tim Wojtulewicz
6fba0f7ce9 Update cmake submodule [nomail] 2024-02-21 12:20:45 -07:00
Tim Wojtulewicz
e8b8733de0 Update cmake submodule [nomail] 2024-02-21 11:12:50 -07:00
Tim Wojtulewicz
91152c8722 Point cmake submodule at master branch 2024-02-21 11:09:20 -07:00
Tim Wojtulewicz
3a4d106892 Updating CHANGES and VERSION. 2024-02-20 12:59:33 -07:00
Tim Wojtulewicz
818cd0e049 Switch docs submodule to release/6.2 branch 2024-02-20 12:59:01 -07:00
Tim Wojtulewicz
5102cb8392 Update zkg submodule to v3.0.1 2024-02-20 10:58:38 -07:00
Tim Wojtulewicz
04d965a13a Merge branch 'topic/neverlord/broker-variant' 
* topic/neverlord/broker-variant:
  Pull in variant-enabled Broker
 2024-02-20 10:57:42 -07:00
Dominik Charousset
0a84aad417 Pull in variant-enabled Broker 
Switch the Broker submodule to a version with `broker::variant` enabled
and provide new overloads for `broker::variant` in the Broker manager.
 2024-02-20 09:47:32 -07:00
Tim Wojtulewicz
6de51f0d7a Merge remote-tracking branch 'origin/topic/timw/update-zkg' 
* origin/topic/timw/update-zkg:
  Bump zkg to v3.0.0
 2024-02-15 11:08:30 -05:00
Tim Wojtulewicz
8bef179ab1 Merge remote-tracking branch 'origin/topic/bbannier/bump-spicy' 
* origin/topic/bbannier/bump-spicy:
  Bump Spicy to latest dev snapshot.
 2024-02-15 11:07:25 -05:00
Tim Wojtulewicz
3a4a20c815 Bump zkg to v3.0.0 2024-02-15 10:21:23 -05:00
Benjamin Bannier
7c459b94c6 Bump Spicy to latest dev snapshot. 2024-02-15 15:20:46 +01:00
Arne Welzel
72eb565c5e Merge remote-tracking branch 'origin/topic/awelzel/cheaper-hex-printing' 
* origin/topic/awelzel/cheaper-hex-printing:
  zeek.bif: Booleanate String constructor calls
  Conn/net_utils/fmt_mac: Avoid snprintf(), memcpy() and allocation
  bytestring_to_hexstr: Use bytetohex() instead of snprintf()
  digest/digest_print: Use bytetohex() instead of snprintf()
 2024-02-13 20:10:15 +01:00
Arne Welzel
485950fcff zeek.bif: Booleanate String constructor calls 2024-02-13 20:08:31 +01:00
Arne Welzel
29f5b507b6 Conn/net_utils/fmt_mac: Avoid snprintf(), memcpy() and allocation 
The fmt_mac() function returning a std::string means the resulting mac
is copied at least once upon returning. Then, the Assign() in GetVal()
taking a std::string internally allocates a new zeek::String which
hits a malloc (no short-string optimization for zeek::String) and then
also copies the content from the std::string into the malloced memory.

Save a few cycles by directly using the allocated memory with the
String instance. This change improves runtime for a SYN-only pcap
with just base/protocols/conn loaded by some 1-2%.
 2024-02-13 19:37:15 +01:00
Arne Welzel
c41977057a bytestring_to_hexstr: Use bytetohex() instead of snprintf() 
...also avoid the extra memcpy and memory allocation.
 2024-02-13 19:37:12 +01:00
Arne Welzel
4fc08d8fc2 digest/digest_print: Use bytetohex() instead of snprintf() 2024-02-13 19:32:16 +01:00
zeek-bot
32a0260291 Update doc submodule [nomail] [skip ci] 2024-02-09 00:23:46 +00:00
Arne Welzel
382121fd8c Merge remote-tracking branch 'origin/topic/awelzel/stmt-extern' 
* origin/topic/awelzel/stmt-extern:
  Bump zeekjs for STMT_ANY deprecation
  Stmt: Deprecate STMT_ANY
  Stmt: Introduce STMT_EXTERN
 2024-02-08 15:12:33 +01:00
zeek-bot
8f56140f73 Update doc submodule [nomail] [skip ci] 2024-02-08 00:18:14 +00:00
Tim Wojtulewicz
5db7b3d567 Merge remote-tracking branch 'origin/topic/timw/update-vcpkg' 
* origin/topic/timw/update-vcpkg:
  Update .gitignore to add Emacs and Vim temp files
  Update vcpkg submodule to pull in c-ares 1.26.0 to match other platforms
 2024-02-07 12:50:07 -07:00
Tim Wojtulewicz
5fa606ec01 Update .gitignore to add Emacs and Vim temp files 2024-02-07 12:12:58 -07:00
Tim Wojtulewicz
2426cef41c Update vcpkg submodule to pull in c-ares 1.26.0 to match other platforms 2024-02-07 12:12:58 -07:00
Christian Kreibich
1f2821dfe3 Merge branch 'topic/christian/news-additions' 
* topic/christian/news-additions:
  Some NEWS updates for 6.2 [skip ci]
 2024-02-07 09:36:36 -08:00
Arne Welzel
fa97e08f60 Merge remote-tracking branch 'origin/topic/awelzel/websocket-spicy-analyzer' 
* origin/topic/awelzel/websocket-spicy-analyzer:
  websocket: Implement Spicy's unmask in C++
  websocket: Add Spicy parser version, too.
 2024-02-07 13:15:59 +01:00