Fix build without openssl/engine.h #4873
Open
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
|
Thanks for the PR. This looks correct to me. Requesting CI run and another reviewer. |
|
@yselkowitz I suspect that the test might also need to be gated. |
|
We've previously discussed this code change: #4705 |
The ENGINE APIs are deprecated in OpenSSL v3, and the <openssl/engine.h> header is not always available anymore (e.g. Fedora 41 and RHEL 10). This places the inclusion of the header under the same condition as the use of its declarations.
Indeed, modified.
Of course I hadn't seen that other PR, but this is no longer a narrow usecase; both Fedora 41 and RHEL 10 do not include the engine.h header by default or at all, and there is increasing compatibility in the ecosystem with inclusion of this header needing to be gated. |
|
Heads up @yselkowitz. We are implementing a more comprehensive version of this (feature probe for ENGINE support). #4878 |
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.
Resolved issues:
Description of changes:
The ENGINE APIs are deprecated in OpenSSL v3, and the <openssl/engine.h> header is not always available anymore (e.g. Fedora 41 and RHEL 10). This places the inclusion of the header under the same condition as the use of its declarations.
Call-outs:
Testing:
Mock-built on both Fedora 40 (where ENGINE is not deprecated and the header is present by default) and rawhide (where ENGINE is deprecated and the header is in an uninstalled separate subpackage).