From patchwork Wed Dec 11 16:15:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 16740 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 2D974449F3A for ; Wed, 11 Dec 2019 18:17:04 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0DD7168ACFA; Wed, 11 Dec 2019 18:17:04 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ua1-f66.google.com (mail-ua1-f66.google.com [209.85.222.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 33BF668AC81 for ; Wed, 11 Dec 2019 18:16:58 +0200 (EET) Received: by mail-ua1-f66.google.com with SMTP id d6so9032686uam.11 for ; Wed, 11 Dec 2019 08:16:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=VoXlu01LG0FSUMm0mfaUXxr+/47XLVoqEURpu47RzSU=; b=ANVkrIrbXX6WDnDyBq3WiRI37f/0ALBtmv8DsbwvJj+FAJgNkq7mHq+sNvo2a6EwEt kL3FJlqv3p9nYl9SdxwOU22iBQFlcNUoKMZMgoitc//zcNjpELlS8x4Y5Gk07qlMlYWI 219vxIs764aQgk25DaCNSF+6UHBRPWzyF/0AbA4TTczbaJ+jRVQqImPBNRTeOgtgpdai +KP5Cxge8a4dXz261eDWomNPiW3YOF3MkKuD4Yek0EqtfaOWPv9MimqMYZ5uwQjoq0tK 8GErZJgcmng58icQHdRKzb9+U2dCJZBTe6SwjlArnv79WDC//WgLLqGS+XFzg08tMsM0 5Jyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=VoXlu01LG0FSUMm0mfaUXxr+/47XLVoqEURpu47RzSU=; b=YZv7RaSekAL9QJyk+hxxlOmRYIDiTGlZAKFm6y/Fd9LYHUaVd9L8/3My6f+zLnneXW Ylap5I6yxF+lmpmXfYHGvT/FEhbFSdxbdJjBqokQAoKCnmaGeiqwHPT0ToUhdJQYgtwx 6wjoGrmI24r8JzNjOjm7PC1jEbBnN2WKGkN0weObVV7bKmyBIGVLYTVJkTQmn1bkFWg7 R2ELEKgbJw87v/fIerXaY97IFduuM5rsMqA1CODo6nJH5A0nosyem5lhE0ZfuVEpNUzs 7vhJo5mtbdW9Ph5819rt9rQ69orA5lmgkITKxjHOyOpfnWpVk00wJqW7vZIbS3smYKtE IDYg== X-Gm-Message-State: APjAAAWY7Vv5uhABGzWh+M02QjsTAGJLhXtv166VuMytXlEyvKN0/ieF BFW70xBePqr3BuuYeXrGffJDOq5a X-Google-Smtp-Source: APXvYqzE3sKzGiZRRADrFXrwB1uKTKDLaUZ8xg3P39G7bW/iKsWgaRjOKECLIYqgaqN/9KSy+TLGNA== X-Received: by 2002:ab0:7448:: with SMTP id p8mr3791352uaq.71.1576081016615; Wed, 11 Dec 2019 08:16:56 -0800 (PST) Received: from localhost.localdomain ([181.23.74.95]) by smtp.gmail.com with ESMTPSA id z7sm1359626vsf.14.2019.12.11.08.16.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Dec 2019 08:16:56 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 11 Dec 2019 13:15:49 -0300 Message-Id: <20191211161549.9285-1-jamrial@gmail.com> X-Mailer: git-send-email 2.24.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/tls_openssl: don't use libcrypto locking functions with newer OpenSLL versions X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" They have been removed altogheter without a compat implementatino, 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 --- libavformat/tls_openssl.c | 6 +++--- 1 file 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 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);