[sr-dev] git:5.4:e9baba91: tls: proper ifdef on libssl version for tls_init_locks()

Daniel-Constantin Mierla miconda at gmail.com
Sun Aug 30 18:06:04 CEST 2020


Module: kamailio
Branch: 5.4
Commit: e9baba91c6c7e3d1817e8a07bbabbce3a8efbe79
URL: https://github.com/kamailio/kamailio/commit/e9baba91c6c7e3d1817e8a07bbabbce3a8efbe79

Author: Daniel-Constantin Mierla <miconda at gmail.com>
Committer: Daniel-Constantin Mierla <miconda at gmail.com>
Date: 2020-08-30T18:05:43+02:00

tls: proper ifdef on libssl version for tls_init_locks()

- avoid compile warning on unused label

(cherry picked from commit 60bd3aa284a5d9eb117a9763aa590aecf276ba16)

---

Modified: src/modules/tls/tls_locking.c

---

Diff:  https://github.com/kamailio/kamailio/commit/e9baba91c6c7e3d1817e8a07bbabbce3a8efbe79.diff
Patch: https://github.com/kamailio/kamailio/commit/e9baba91c6c7e3d1817e8a07bbabbce3a8efbe79.patch

---

diff --git a/src/modules/tls/tls_locking.c b/src/modules/tls/tls_locking.c
index 3eb6f033a5..21078e82d9 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 thread-safe since 1.1.0 */
+/* OpenSSL is no longer supporting to set locking callbacks since 1.1.0 */
 #if OPENSSL_VERSION_NUMBER < 0x10100000L
 	/* init "static" tls locks */
 	n_static_locks=CRYPTO_num_locks();
@@ -185,10 +185,13 @@ 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