Skip to content

Sync EvpDigest between OpenSSL <1.1 and 1.1+#2086

Merged
BareosBot merged 2 commits intobareos:masterfrom
rainerjung:openssl-1.0-EvpDigest
Dec 21, 2024
Merged

Sync EvpDigest between OpenSSL <1.1 and 1.1+#2086
BareosBot merged 2 commits intobareos:masterfrom
rainerjung:openssl-1.0-EvpDigest

Conversation

@rainerjung
Copy link
Contributor

@rainerjung rainerjung commented Dec 20, 2024

Commit PR #1689 (812f9e4) contains a change in core/src/lib/crypto.h, which has only been partially synced with core/src/lib/crypto_openssl.cc. The latter file contains two definitions of EvpDigest(), depending on OpenSSL major version. Only one was fixed.

When compiling e.g. on CentOS 7 one gets an error about shadowing.

Thank you for contributing to the Bareos Project!

Please check

  • Short description and the purpose of this PR is present above this paragraph
  • Your name is present in the AUTHORS file (optional)

If you have any questions or problems, please give a comment in the PR.

Helpful documentation and best practices

Checklist for the reviewer of the PR (will be processed by the Bareos team)

Make sure you check/merge the PR using devtools/pr-tool to have some simple automated checks run and a proper changelog record added.

General
Source code quality
  • Source code changes are understandable
  • Variable and function names are meaningful
  • Code comments are correct (logically and spelling)
  • Required documentation changes are present and part of the PR

Copy link
Member

@pstorz pstorz left a comment

Choose a reason for hiding this comment

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

Makes sense. Thank you!

Commit PR #1689 (812f9e4) contains a
change in core/src/lib/crypto.h, which has only been partially synced
with core/src/lib/crypto_openssl.cc. The latter file contains two
definitions of EvpDigest(), depending on OpenSSL major version. Only one
was fixed.

When compiling e.g. on CentOS 7 one gets an error about shadowing.
@pstorz pstorz modified the milestones: 24.0.1, 25.0.0 Dec 21, 2024
@pstorz pstorz self-assigned this Dec 21, 2024
@BareosBot BareosBot merged commit 1acf130 into bareos:master Dec 21, 2024
@rainerjung rainerjung deleted the openssl-1.0-EvpDigest branch December 21, 2024 19:05
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