Fix OPENSSL_cleanup() detection without using our own atexit() handler #551
+15
−25
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
|
Note outstanding request for testing, at https://bugzilla.redhat.com/show_bug.cgi?id=1831086#c11 |
|
Those CI failures don't look like they're mine... |
Note confirmation of fix from user, at https://bugzilla.redhat.com/show_bug.cgi?id=1831086#c12 |
We can't register our own atexit() or OPENSSL_atexit() handler because there's no way to unregister it when the SoftHSM DSO is unloaded. This causes the crash reported at https://bugzilla.redhat.com/1831086#c8 Instead of using that method to set a flag showing that OPENSSL_cleanup() has occurred, instead test directly by calling OPENSSL_init_crypto() for something that *would* do nothing, but will fail if OPENSSL_cleanup() has indeed been run already. Fixes: c2cc065 "Issue opendnssec#548: Don't clean up engines after OpenSSL has already shut down"
|
No change other than commit date; just trying to prod the CI as some of those failures look transient. |
|
OK, the travis-ci build is now OK, and appveyor has been broken in master for a while. Ignoring that. |
|
Will ask @halderen for another review and to merge it if OK. |
nomis
reviewed
Aug 15, 2020
| // Detect that situation because reinitialisation will fail | ||
| // after OPENSSL_cleanup() has run. | ||
| (void)ERR_set_mark(); | ||
| ossl_shutdown = !OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_RDRAND, NULL); |
There was a problem hiding this comment.
It's possible to compile OpenSSL without RDRAND support.
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.
We can't register our own atexit() or OPENSSL_atexit() handler because
there's no way to unregister it when the SoftHSM DSO is unloaded. This
causes the crash reported at https://bugzilla.redhat.com/1831086#c8
Instead of using that method to set a flag showing that OPENSSL_cleanup()
has occurred, instead test directly by calling OPENSSL_init_crypto() for
something that would do nothing, but will fail if OPENSSL_cleanup()
has indeed been run already.
Fixes: c2cc065 "Issue #548: Don't clean up engines after OpenSSL
has already shut down"