Skip to content

crypto: fix build with OPENSSL_NO_ENGINE [Backport to 4.2]#11874

Merged
cosmo0920 merged 3 commits into
4.2from
openssl4-4.2
May 29, 2026
Merged

crypto: fix build with OPENSSL_NO_ENGINE [Backport to 4.2]#11874
cosmo0920 merged 3 commits into
4.2from
openssl4-4.2

Conversation

@cosmo0920
Copy link
Copy Markdown
Contributor

Backporting of #11771.


Enter [N/A] in the box, if an item is not applicable to your change.

Testing
Before we can approve your change; please submit the following in a comment:

  • Example configuration file for the change
  • Debug log output from testing the change
  • Attached Valgrind output that shows no leaks or memory corruption was found

If this is a change to packaging of containers or native binaries then please confirm it works for all targets.

  • Run local packaging test showing all targets (including any new ones) build.
  • Set ok-package-test label to test for all targets (requires maintainer to do).

Documentation

  • Documentation required for this feature

Backporting

  • Backport to latest stable release.

Fluent Bit is licensed under Apache 2.0, by submitting this pull request I understand that this code will be released under the terms of that license.

lecaros and others added 3 commits May 28, 2026 19:55
Signed-off-by: lecaros <lecaros@chronosphere.io>
Signed-off-by: lecaros <lecaros@chronosphere.io>
ENGINE was deprecated in openssl 3.0 (and disabled in RHEL 10), and
completely removed in 4.0.

Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
@coderabbitai
Copy link
Copy Markdown

coderabbitai Bot commented May 28, 2026

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Pro

Run ID: 266f4f81-d77c-428c-8d3f-6a1f7ff40904

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch openssl4-4.2

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

Copy link
Copy Markdown

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: b1f73b7a37

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment on lines +101 to +103
if (primary_key_check(k, LOGDNA_LEVEL_KEY, sizeof(LOGDNA_LEVEL_KEY) - 1) == FLB_TRUE ||
primary_key_check(k, LOGDNA_SEVERITY_KEY, sizeof(LOGDNA_SEVERITY_KEY) - 1) == FLB_TRUE) {
is_primary = FLB_TRUE;
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Preserve unpromoted level/severity values

When exclude_promoted_keys is enabled and a record contains both level and severity, this marks both keys as primary even though only the first one is actually emitted as the top-level level. For example { "level": "info", "severity": "warning" } with level first will output top-level level: info and then omit severity from the filtered line, so the warning value is lost. Please only exclude the level/severity key that was actually promoted, or keep the later value in the line body.

Useful? React with 👍 / 👎.

@cosmo0920 cosmo0920 merged commit 103b5eb into 4.2 May 29, 2026
25 checks passed
@cosmo0920 cosmo0920 deleted the openssl4-4.2 branch May 29, 2026 02:54
@cosmo0920 cosmo0920 added this to the Fluent Bit v4.2.5 milestone May 29, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants