Next/60x/20230115/v4 #8454
Merged
Next/60x/20230115/v4 #8454
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The unit test for content |aa bz| transforms in place the string str to replace the 2 characters aa by one character 0xaa Then, when z is not recognized as a valid hexadeicmal character, the whole modified string is printed out, inclusing the non-ascii 0xaa Ticket: OISF#5558 (cherry picked from commit b281199)
This commit reduces the changes associated with adding the v14 api to 6.0.x During the preparation of this commit, issues in the original backport were corrected - Failure to release a lock under error conditions - Typo in an CPP ifdef - Incorrect target for goto statement in an error handling case. Issue: 5744
cf https://redmine.openinfosecfoundation.org/issues/4125 This allows fuzz_applayerparser_parse to fuzz one specific app-layer protocol based on the binary name, as is done with the environment variable FUZZ_APPLAYER That is if we rename/copy to fuzz_applayerparser_parse_smb, it will fuzz only SMB protocol This way, we can easily produce different fuzz targets for each protocol in oss-fuzz (cherry picked from commit e9b76a0)
Inspired by commit ddf14e5 But keeping old nom version
Set the engine to ignore the stream.midstream-policy if stream.midstream is enabled. If we had both stream.midstream AND stream.midstream_policy enabled, this could lead to midstream flows being dropped (or bypassed, or...) instead of being accepted by the engine, as it was probably meant when the user enabled midstream flows. Bug OISF#5765 (cherry picked from commit 8e9905e)
This was referenced Jan 25, 2023
Merged
|
Information: QA ran without warnings. Pipeline 11954 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Staging:
suricata-verify-pr: 1081