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

Merge remote-tracking branch 'origin/topic/neverlord/ssl-auth-test'

Browse source 
* origin/topic/neverlord/ssl-auth-test:
  Revert to regular peering fn for ssl_auth_failure
This commit is contained in:
Tim Wojtulewicz 2022-08-26 09:09:23 -07:00
commit 2d7bfb4ca7
4 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
CHANGES
View file

@ -1,3 +1,14 @@
5.1.0-dev.461 | 2022-08-26 09:09:23 -0700
* Revert to regular peering fn for ssl_auth_failure (Dominik Charousset, Corelight)
With the fixed Broker version, the `ssl_auth_failure` btest can use the
regular `peer` function again.
* Bump Spicy dependencies to spicy-1.5.1 and spicy-plugin-1.3.17. (Benjamin Bannier, Corelight)
(cherry picked from commit 7e1840f5fed47ddaa9111f265bb647f16c49663a)
5.1.0-dev.457 | 2022-08-25 15:15:29 -0700 5.1.0-dev.457 | 2022-08-25 15:15:29 -0700
* Switch macOS Monterey build to new m1-based VM (Tim Wojtulewicz, Corelight) * Switch macOS Monterey build to new m1-based VM (Tim Wojtulewicz, Corelight)

2
VERSION
View file

@ -1 +1 @@
5.1.0-dev.457 5.1.0-dev.461

2
auxil/broker

@ -1 +1 @@
Subproject commit 772a37ff650040205481e6b52a8a1ba3c6e94f02 Subproject commit 5e64f93f9e52e1cc1b3612589e2d46eb460f58aa

4
testing/btest/broker/ssl_auth_failure.zeek
View file

@ -100,7 +100,7 @@ BTdqMbieumB/zL97iK5baHUFEJ4VRtLQhh/SOXgew/BF8ccpilI=
event zeek_init() event zeek_init()
{ {
Broker::__peer_no_retry("127.0.0.1", to_port(getenv("BROKER_PORT"))); Broker::peer("127.0.0.1", to_port(getenv("BROKER_PORT")));
} }
event Broker::peer_added(endpoint: Broker::EndpointInfo, msg: string) event Broker::peer_added(endpoint: Broker::EndpointInfo, msg: string)
@ -121,7 +121,7 @@ redef Broker::ssl_certificate = "../cert.1.pem";
event zeek_init() event zeek_init()
{ {
Broker::__peer_no_retry("127.0.0.1", to_port(getenv("BROKER_PORT"))); Broker::peer("127.0.0.1", to_port(getenv("BROKER_PORT")));
} }
event Broker::peer_added(endpoint: Broker::EndpointInfo, msg: string) event Broker::peer_added(endpoint: Broker::EndpointInfo, msg: string)