Commit graph

13262 commits

Author SHA1 Message Date
zeek-bot
bedcc6820f Update doc submodule [nomail] [skip ci] 2022-03-24 00:33:38 +00:00
Vern Paxson
bcebe27ced updates for compile-to-C++ 2022-03-23 15:36:36 -07:00
Vern Paxson
16a16948a1 updates for ZAM optimization 2022-03-23 15:36:36 -07:00
Vern Paxson
1f27edf756 btest tweaks I overlooked 2022-03-23 15:36:35 -07:00
Vern Paxson
18cfee51c2 updates for script optimization 2022-03-23 15:36:35 -07:00
Vern Paxson
ae75635c5a new btests to cover extended functionality & associatd errors 2022-03-23 15:36:35 -07:00
Vern Paxson
64775a8192 updates to btests to support switch to expression-based initialization 2022-03-23 15:36:35 -07:00
Vern Paxson
f62c04c9eb tweaks to base scripts revealed by switch to expression-based initialization 2022-03-23 15:36:35 -07:00
Vern Paxson
63f902daff switch variable initialization over to being expression-based 2022-03-23 15:36:35 -07:00
Vern Paxson
c3e2871a5e simplification of Val classes now that they don't have to support initialization 2022-03-23 15:36:35 -07:00
Vern Paxson
9b6a3e8b74 factoring and re-working of type merging 2022-03-23 15:36:35 -07:00
Vern Paxson
0bbbd84c9d use new interface for associating attributes with constructors 2022-03-23 15:36:35 -07:00
Vern Paxson
96f52b0e11 rework type inference due to switch from separate initializers to expressions 2022-03-23 15:36:35 -07:00
Vern Paxson
72b937bfdf avoid evaluating calls to determine whether an expression value is ignored 2022-03-23 15:36:35 -07:00
Vern Paxson
4d051620e8 reworking of expressions to unify =/+=/-= with initialization 2022-03-23 15:36:35 -07:00
Vern Paxson
8e745f6f48 allow {} expression lists for =/+=/-= RHS 2022-03-23 15:36:35 -07:00
Vern Paxson
e13dd30565 tweak for comparing redundant-but-complex attributes 2022-03-23 15:36:35 -07:00
Vern Paxson
75652927e2 low-level style tweaks 2022-03-23 10:03:13 -07:00
Vern Paxson
ecd273c3ca --event-trace / -E option to generate event trace 2022-03-23 10:03:13 -07:00
Vern Paxson
39cbd7a9dc hooks to support event tracing 2022-03-23 10:03:13 -07:00
Vern Paxson
25e096b50a classes providing event-tracing/dumping functionality 2022-03-23 10:03:13 -07:00
Vern Paxson
cde677bd97 provide access to Val internals for event tracing purposes 2022-03-23 10:03:13 -07:00
Vern Paxson
3ff390717d set_network_time() BiF in support of event replaying 2022-03-23 10:03:13 -07:00
Vern Paxson
475063804e low-level naming tweaks / comments / const-ified accessor 2022-03-23 10:03:13 -07:00
Johanna Amann
095ab178f3 Merge remote-tracking branch 'origin/topic/johanna/ssl-history-doc'
* origin/topic/johanna/ssl-history-doc:
  Improve the formatting of the SSL::Info::ssl_history documentation
2022-03-23 13:06:22 +01:00
Johanna Amann
f02079e3c8 Improve the formatting of the SSL::Info::ssl_history documentation 2022-03-23 10:03:45 +01:00
Johanna Amann
67410a0aa3 Update doc submodule
[nomail]
2022-03-23 09:12:17 +01:00
Tim Wojtulewicz
c299301372 Update zeek-testing-private hash [nomail] [skip ci] 2022-03-22 13:12:12 -07:00
Christian Kreibich
145c7063c6 Add cmake-time reporting of bifcl, binpac, and gen-zam used for build
Cross-compilation requires providing those pre-built for the build host, so it
helps to see confirmation of the three --with-... overrides.
2022-03-21 15:30:10 -07:00
Christian Kreibich
e403dd5fe1 Build Gen-ZAM from a submodule and support use of pre-existing executable
This separates Gen-ZAM from the main Zeek distribution and places it in a
submodule at auxil/gen-zam, reflecting binpac and bifcl. Configuring with
--with-gen-zam=... allws reuse of an existing executable.
2022-03-21 15:30:07 -07:00
Christian Kreibich
0a344a3ad7 Merge branch 'topic/christian/fix-docs-gen'
* topic/christian/fix-docs-gen:
  Fix document generation
2022-03-16 15:06:23 -07:00
Tim Wojtulewicz
b6a31421df Update docs submodule [nomail] [skip ci] 2022-03-16 15:00:21 -07:00
Christian Kreibich
912a2fbfef Fix document generation
We broke multi-repo git interaction when we introduced use of "actions/checkout",
because it has subtle implications on auth mechanisms (for details, check action
logs when it conducts a recursive checkout). Thankfully it also helps overcome
these: passing a user token to actions/checkout simplifies multi-repo git interaction,
making it work as it should: you no longer need to think about it. We now use this
approach.

Also tweak the git commit logic: we no longer mask all errors. Seems we mainly
did that to mask "git commit" on no changes erroring out. Instead we now check
whether there's anything to commit, and only do so then. We do this both in the
zeek-docs repo and for the docs submodule bump.
2022-03-16 12:12:25 -07:00
Tim Wojtulewicz
c99a5c8d11 Update doc submodule [nomail] [skip ci] 2022-03-11 14:34:00 -07:00
Tim Wojtulewicz
2386b650cd Merge remote-tracking branch 'ynadji/raw_bytes_to_v6_addr'
* ynadji/raw_bytes_to_v6_addr:
  add raw_bytes_to_v6_addr in docs when raw_bytes_to_v4_addr is present
  Zero out bytes by default for consistent return value on error
  Add tests for raw_bytes_to_v6_addr
  Add raw_bytes_to_v6_addr function
2022-03-10 11:09:49 -07:00
Yacin Nadji
f71ac032a6 add raw_bytes_to_v6_addr in docs when raw_bytes_to_v4_addr is present 2022-03-09 11:16:20 -05:00
Yacin Nadji
a2320ffe88 Zero out bytes by default for consistent return value on error 2022-03-09 11:15:48 -05:00
Yacin Nadji
45ab85c09e Add tests for raw_bytes_to_v6_addr 2022-03-08 17:50:26 -05:00
Tim Wojtulewicz
c07559bca2 Merge remote-tracking branch 'origin/topic/timw/fix-bsd-getopt'
* origin/topic/timw/fix-bsd-getopt:
  Update 3rdparty submodule for bsd-getopt-long fix
2022-03-08 09:30:48 -07:00
Tim Wojtulewicz
c048744c2a Update 3rdparty submodule for bsd-getopt-long fix 2022-03-08 09:30:11 -07:00
Robin Sommer
597c2d43fa
Merge remote-tracking branch 'origin/topic/robin/improve-broker-error-msg'
* origin/topic/robin/improve-broker-error-msg:
  Improve error message when receiving unexpected record content via Broker.
2022-03-07 12:37:39 +01:00
Robin Sommer
130d93f0de
Improve error message when receiving unexpected record content via Broker.
Broker sends record values as a vector of the corresponding fields. If
the received values doesn't match the actual record fields, Zeek has
so far been reporting this not-so-helpful error message:

    warning: failed to convert remote event 'got_result' arg #1, got vector, expected record

This change turns the latter part into a list of the field types we
actually received, which makes debugging much easier.

(No test, seems overkill to add a spawn a Broker client to exercise
this.)
2022-03-07 10:52:17 +01:00
Johanna Amann
ff4f3f359c Merge remote-tracking branch 'origin/topic/vern/rec-constr-check'
* origin/topic/vern/rec-constr-check:
  associated btest
  fix base scripts to include mandatory fields in record constructors
  restored record constructor checking for missing-but-mandatory fields
2022-03-02 13:49:31 +00:00
Johanna Amann
f264a9eccf Merge remote-tracking branch 'origin/topic/christian/gh-1982'
* origin/topic/christian/gh-1982:
  The is_num(), is_alpha(), and is_alnum() BiFs now return F on empty string
  Expand testcases around is_num(), is_alpha(), is_alnum(), is_ascii() BiFs
  Clarify is_ascii() BiF docstring re behavior on empty strings
  Fix minor indentation bugs in strings.bif
2022-03-02 08:25:41 +00:00
Johanna Amann
d38923cfcf Merge remote-tracking branch 'origin/topic/johanna/tls12-decryption'
Documentation is missing and will be added in the next couple of hours.

* origin/topic/johanna/tls12-decryption: (24 commits)
  TLS decryption: add test, fix small issues
  Address PR feedback
  TLS decryption: refactoring, more comments, less bare pointers
  Small code fix and test baseline update.
  SSL decryption: refactor TLS12_PRF
  SSL decryption: small style changes, a bit of documentation
  Deprecation and warning fixes
  Clang-format updates
  add missing call to EVP_KDF_CTX_set_params
  TLS decryption: remove payload from ssl_encrypted_data again.
  TLS 1.2 decryption: adapt OpenSSL 3.0 changes for 1.1
  ssl: adapt TLS-PRF to openSSL 3.0
  ssl/analyzer: potentially fix memory leaks caused by bytestrings
  analyzer/ssl: several improvements
  analyzer/ssl: defensive key length check + more debug logging
  testing: feature gate ssl/decryption test
  testing: add ssl/decryption test
  analyzer/ssl: handle missing <openssl/kdf.h>
  analyzer/ssl: silence warning in DTLS analyzer
  analyzer/ssl: move proc-{client,server}-hello into the respective analyzers
  ...
2022-03-02 08:20:39 +00:00
Johanna Amann
590d4aa13e TLS decryption: add test, fix small issues
Add a test loading keys from an external file. Make some debug messages
slightly better and remove unnecessary debug output.
2022-03-01 17:45:11 +00:00
Vern Paxson
b3ff872bd7 associated btest 2022-02-28 17:38:32 -08:00
Vern Paxson
c77f543a17 fix base scripts to include mandatory fields in record constructors 2022-02-28 15:33:46 -08:00
Vern Paxson
3e0b46b963 restored record constructor checking for missing-but-mandatory fields 2022-02-28 15:33:03 -08:00
Christian Kreibich
b977e76ad5 The is_num(), is_alpha(), and is_alnum() BiFs now return F on empty string 2022-02-28 13:27:06 -08:00