diff options
| author | Simon Giesecke <simon.giesecke@btc-ag.com> | 2018-03-12 14:07:18 +0100 |
|---|---|---|
| committer | Alan Antonuk <alan.antonuk@gmail.com> | 2018-03-22 23:33:17 -0700 |
| commit | 0d7f84f0b1f5fb322ff2bca9262fb8faf99202e4 (patch) | |
| tree | d4b7671592f1cc672e6f228c62d5a34767e50173 /librabbitmq/amqp_openssl.c | |
| parent | ef8c3b9d2bbe99c6c279554e86e460cf3fbe7ed3 (diff) | |
| download | rabbitmq-c-0d7f84f0b1f5fb322ff2bca9262fb8faf99202e4.tar.gz | |
Lib: remove use of OpenSSL functions deprecated in v1.1.0+
Diffstat (limited to 'librabbitmq/amqp_openssl.c')
| -rw-r--r-- | librabbitmq/amqp_openssl.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/librabbitmq/amqp_openssl.c b/librabbitmq/amqp_openssl.c index e9f71f2..40a01e8 100644 --- a/librabbitmq/amqp_openssl.c +++ b/librabbitmq/amqp_openssl.c @@ -583,7 +583,15 @@ static int setup_openssl(void) { CRYPTO_set_id_callback(ssl_threadid_callback); CRYPTO_set_locking_callback(ssl_locking_callback); +#ifdef AMQP_OPENSSL_V110 + if (CONF_modules_load_file(NULL, "rabbitmq-c", CONF_MFLAGS_DEFAULT_SECTION) <= + 0) { + status = AMQP_STATUS_SSL_ERROR; + goto out; + } +#else OPENSSL_config(NULL); +#endif SSL_library_init(); SSL_load_error_strings(); @@ -660,7 +668,9 @@ int amqp_uninitialize_ssl_library(void) { amqp_openssl_bio_destroy(); openssl_bio_initialized = 0; +#ifndef AMQP_OPENSSL_V110 ERR_remove_state(0); +#endif FIPS_mode_set(0); CRYPTO_set_locking_callback(NULL); |