Commit abf5e7bc authored by James Almer's avatar James Almer

avformat/tls_openssl: don't use libcrypto locking functions with newer OpenSSL versions

They have been removed altogether without a compat implementation, and are
either no-ops or return NULL.
This fixes compiler warnings about checks always evaluating to false, and leaks
of allocated mutexes.
Signed-off-by: 's avatarJames Almer <jamrial@gmail.com>
parent 8887991a
...@@ -48,7 +48,7 @@ typedef struct TLSContext { ...@@ -48,7 +48,7 @@ typedef struct TLSContext {
#endif #endif
} TLSContext; } TLSContext;
#if HAVE_THREADS #if HAVE_THREADS && OPENSSL_VERSION_NUMBER < 0x10100000L
#include <openssl/crypto.h> #include <openssl/crypto.h>
pthread_mutex_t *openssl_mutexes; pthread_mutex_t *openssl_mutexes;
static void openssl_lock(int mode, int type, const char *file, int line) static void openssl_lock(int mode, int type, const char *file, int line)
...@@ -79,7 +79,7 @@ int ff_openssl_init(void) ...@@ -79,7 +79,7 @@ int ff_openssl_init(void)
SSL_library_init(); SSL_library_init();
SSL_load_error_strings(); SSL_load_error_strings();
#endif #endif
#if HAVE_THREADS #if HAVE_THREADS && OPENSSL_VERSION_NUMBER < 0x10100000L
if (!CRYPTO_get_locking_callback()) { if (!CRYPTO_get_locking_callback()) {
int i; int i;
openssl_mutexes = av_malloc_array(sizeof(pthread_mutex_t), CRYPTO_num_locks()); openssl_mutexes = av_malloc_array(sizeof(pthread_mutex_t), CRYPTO_num_locks());
...@@ -108,7 +108,7 @@ void ff_openssl_deinit(void) ...@@ -108,7 +108,7 @@ void ff_openssl_deinit(void)
ff_lock_avformat(); ff_lock_avformat();
openssl_init--; openssl_init--;
if (!openssl_init) { if (!openssl_init) {
#if HAVE_THREADS #if HAVE_THREADS && OPENSSL_VERSION_NUMBER < 0x10100000L
if (CRYPTO_get_locking_callback() == openssl_lock) { if (CRYPTO_get_locking_callback() == openssl_lock) {
int i; int i;
CRYPTO_set_locking_callback(NULL); CRYPTO_set_locking_callback(NULL);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment