Skip to content

Commit

Permalink
Revert "tls: proper ifdef on libssl version for tls_init_locks()"
Browse files Browse the repository at this point in the history
This reverts commit e9baba9.
  • Loading branch information
linuxmaniac committed Sep 2, 2020
1 parent acebbee commit abebfbe
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions src/modules/tls/tls_locking.c
Expand Up @@ -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();
Expand Down Expand Up @@ -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
}

0 comments on commit abebfbe

Please sign in to comment.