Sync EvpDigest between OpenSSL <1.1 and 1.1+#2087
Merged
pstorz merged 1 commit intobareos:bareos-24from Dec 22, 2024
Merged
Conversation
Commit PR bareos#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. (cherry picked from commit a85a409)
375340f to
6468395
Compare
11 tasks
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Backport of PR #2086 to bareos-24
Checklist for the reviewer of the PR (will be processed by the Bareos team)
Make sure you check/merge the PR using
devtools/pr-toolto have some simple automated checks run and a proper changelog record added.General
Source code quality (if there were changes to the original PR)
Backport quality