diff options
| author | James Almer <jamrial@gmail.com> | 2019-12-11 13:11:59 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2019-12-19 19:30:37 -0300 |
| commit | abf5e7bc212f4cc1e022907f92506ab33c19de44 (patch) | |
| tree | 3f00d9dea4d87eca4a9659732f120450308c5faa | |
| parent | 8887991a3109f94b7d019a11a86e6cd900105258 (diff) | |
| download | ffmpeg-abf5e7bc212f4cc1e022907f92506ab33c19de44.tar.gz | |
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: James Almer <jamrial@gmail.com>
| -rw-r--r-- | libavformat/tls_openssl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/tls_openssl.c b/libavformat/tls_openssl.c index 53f8363a12..e305b2465a 100644 --- a/libavformat/tls_openssl.c +++ b/libavformat/tls_openssl.c @@ -48,7 +48,7 @@ typedef struct TLSContext { #endif } TLSContext; -#if HAVE_THREADS +#if HAVE_THREADS && OPENSSL_VERSION_NUMBER < 0x10100000L #include <openssl/crypto.h> pthread_mutex_t *openssl_mutexes; static void openssl_lock(int mode, int type, const char *file, int line) @@ -79,7 +79,7 @@ int ff_openssl_init(void) SSL_library_init(); SSL_load_error_strings(); #endif -#if HAVE_THREADS +#if HAVE_THREADS && OPENSSL_VERSION_NUMBER < 0x10100000L if (!CRYPTO_get_locking_callback()) { int i; openssl_mutexes = av_malloc_array(sizeof(pthread_mutex_t), CRYPTO_num_locks()); @@ -108,7 +108,7 @@ void ff_openssl_deinit(void) ff_lock_avformat(); openssl_init--; if (!openssl_init) { -#if HAVE_THREADS +#if HAVE_THREADS && OPENSSL_VERSION_NUMBER < 0x10100000L if (CRYPTO_get_locking_callback() == openssl_lock) { int i; CRYPTO_set_locking_callback(NULL); |