OpenSSL 1.1.0 compatibility #2000
Merged
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
edenhill
suggested changes
Sep 13, 2018
src/rdkafka_transport.c
Outdated
| @@ -503,6 +507,13 @@ void rd_kafka_transport_ssl_init (void) { | |||
| SSL_load_error_strings(); | |||
| SSL_library_init(); | |||
| OpenSSL_add_all_algorithms(); | |||
| #else | |||
| #ifdef HAVE_OPENSSL_CRYPTO_THREADID_SET_CALLBACK | |||
| CRYPTO_THREADID_set_callback(rd_kafka_transport_ssl_threadid_cb); | |||
There was a problem hiding this comment.
Can't find if this is actually needed on OpenSSL >=1.1.0, but other projects seem to not use it on that version, so maybe it should be moved to the < 1.1.0 block?
There was a problem hiding this comment.
True. I moved it to the < 1.1.0 block.
src/rdkafka_transport.c
Outdated
| #ifdef HAVE_OPENSSL_CRYPTO_THREADID_SET_CALLBACK | ||
| CRYPTO_THREADID_set_callback(rd_kafka_transport_ssl_threadid_cb); | ||
| #endif | ||
| OPENSSL_init_ssl(0, NULL); |
There was a problem hiding this comment.
This isn't needed according to docs:
https://www.openssl.org/docs/man1.1.0/ssl/OPENSSL_init_ssl.html
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.
Changes to be able to build librdkafka with OpenSSL 1.1.0