This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "".
The branch, master has been updated via 0178075e5e16e843034ac59ad4978e6a70ef86b5 (commit) from d102056f2e93940946f39d5da160c2c0684b3a2e (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 0178075e5e16e843034ac59ad4978e6a70ef86b5 Author: Matias Elo matias.elo@nokia.com Date: Wed Apr 3 14:15:10 2019 +0300
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
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) {
-----------------------------------------------------------------------
Summary of changes: platform/linux-generic/odp_crypto_openssl.c | 6 ++++++ 1 file changed, 6 insertions(+)
hooks/post-receive