[sr-dev] git:5.4:abebfbed: Revert "tls: proper ifdef on libssl version for tls_init_locks()"
Victor Seva
linuxmaniac at torreviejawireless.org
Wed Sep 2 14:21:19 CEST 2020
Module: kamailio
Branch: 5.4
Commit: abebfbed313aaf052f4383ecf03607f17549c63c
URL: https://github.com/kamailio/kamailio/commit/abebfbed313aaf052f4383ecf03607f17549c63c
Author: Victor Seva <linuxmaniac at torreviejawireless.org>
Committer: Victor Seva <linuxmaniac at torreviejawireless.org>
Date: 2020-09-02T14:20:52+02:00
Revert "tls: proper ifdef on libssl version for tls_init_locks()"
This reverts commit e9baba91c6c7e3d1817e8a07bbabbce3a8efbe79.
---
Modified: src/modules/tls/tls_locking.c
---
Diff: https://github.com/kamailio/kamailio/commit/abebfbed313aaf052f4383ecf03607f17549c63c.diff
Patch: https://github.com/kamailio/kamailio/commit/abebfbed313aaf052f4383ecf03607f17549c63c.patch
---
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
}
More information about the sr-dev
mailing list