Module: kamailio Branch: master Commit: da5d71da620deb8b8740256e556011e93cdac1a3 URL: https://github.com/kamailio/kamailio/commit/da5d71da620deb8b8740256e556011e9...
Author: Victor Seva linuxmaniac@torreviejawireless.org Committer: Victor Seva linuxmaniac@torreviejawireless.org Date: 2020-09-02T14:27:18+02:00
Revert "tls: proper ifdef on libssl version for tls_init_locks()"
This reverts commit 60bd3aa284a5d9eb117a9763aa590aecf276ba16.
---
Modified: src/modules/tls/tls_locking.c
---
Diff: https://github.com/kamailio/kamailio/commit/da5d71da620deb8b8740256e556011e9... Patch: https://github.com/kamailio/kamailio/commit/da5d71da620deb8b8740256e556011e9...
---
diff --git a/src/modules/tls/tls_locking.c b/src/modules/tls/tls_locking.c index 21078e82d9..3eb6f033a5 100644 --- a/src/modules/tls/tls_locking.c +++ b/src/modules/tls/tls_locking.c @@ -140,7 +140,7 @@ unsigned long sr_ssl_id_f() /* returns -1 on error, 0 on success */ int tls_init_locks() { -/* OpenSSL is no longer supporting to set locking callbacks since 1.1.0 */ +/* OpenSSL is thread-safe since 1.1.0 */ #if OPENSSL_VERSION_NUMBER < 0x10100000L /* init "static" tls locks */ n_static_locks=CRYPTO_num_locks(); @@ -185,13 +185,10 @@ int tls_init_locks() * (only atomic_inc), fallback to the default use-locks mode * CRYPTO_set_add_lock_callback(atomic_add_f); */ +#endif
return 0; error: tls_destroy_locks(); return -1; - -#else - return 0; -#endif }
-
Victor Seva