diff options
| author | Matias Elo <matias.elo@nokia.com> | 2019-04-03 14:15:10 +0300 |
|---|---|---|
| committer | Petri Savolainen <petri.savolainen@nokia.com> | 2019-04-11 12:41:31 +0300 |
| commit | 0178075e5e16e843034ac59ad4978e6a70ef86b5 (patch) | |
| tree | 552cc53e48541f5f18d3e5f144df2ae7b0ff136c | |
| parent | d102056f2e93940946f39d5da160c2c0684b3a2e (diff) | |
linux-gen: crypto: disable openssl locking callbacks
Starting from OpenSSL versions 1.1.0 the locking callbacks are no longer
required.
Fixes: https://github.com/OpenDataPlane/odp/issues/817
Signed-off-by: Matias Elo <matias.elo@nokia.com>
Reviewed-by: Petri Savolainen <petri.savolainen@nokia.com>
Reported-by: Jussi Kerttula <jussi.kerttula@nokia.com>
| -rw-r--r-- | platform/linux-generic/odp_crypto_openssl.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/platform/linux-generic/odp_crypto_openssl.c b/platform/linux-generic/odp_crypto_openssl.c index 8feebefb3..7507f1aa8 100644 --- a/platform/linux-generic/odp_crypto_openssl.c +++ b/platform/linux-generic/odp_crypto_openssl.c @@ -1828,6 +1828,7 @@ odp_crypto_operation(odp_crypto_op_param_t *param, return 0; } +#if OPENSSL_VERSION_NUMBER < 0x10100000L static void ODP_UNUSED openssl_thread_id(CRYPTO_THREADID ODP_UNUSED *id) { CRYPTO_THREADID_set_numeric(id, odp_thread_id()); @@ -1842,6 +1843,7 @@ static void ODP_UNUSED openssl_lock(int mode, int n, else odp_ticketlock_unlock(&global->openssl_lock[n]); } +#endif int odp_crypto_init_global(void) @@ -1880,8 +1882,10 @@ odp_crypto_init_global(void) for (idx = 0; idx < nlocks; idx++) odp_ticketlock_init(&global->openssl_lock[idx]); +#if OPENSSL_VERSION_NUMBER < 0x10100000L CRYPTO_THREADID_set_callback(openssl_thread_id); CRYPTO_set_locking_callback(openssl_lock); +#endif } return 0; @@ -1901,8 +1905,10 @@ int odp_crypto_term_global(void) rc = -1; } +#if OPENSSL_VERSION_NUMBER < 0x10100000L CRYPTO_set_locking_callback(NULL); CRYPTO_set_id_callback(NULL); +#endif ret = odp_shm_free(odp_shm_lookup("_odp_crypto_pool_ssl")); if (ret < 0) { |