From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <ffmpeg-devel-bounces@ffmpeg.org>
Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100])
by master.gitmailbox.com (Postfix) with ESMTPS id 7EDDD4D2D1
for <ffmpegdev@gitmailbox.com>; Sun, 15 Jun 2025 15:16:07 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 3D94D68D459;
Sun, 15 Jun 2025 18:16:04 +0300 (EEST)
To: ffmpeg-devel@ffmpeg.org
Date: Sun, 15 Jun 2025 23:15:45 +0800
MIME-Version: 1.0
Message-ID: <mailman.3309.1750000563.1384.ffmpeg-devel@ffmpeg.org>
List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org>
List-Post: <mailto:ffmpeg-devel@ffmpeg.org>
From: Jack Lau via ffmpeg-devel <ffmpeg-devel@ffmpeg.org>
Precedence: list
Cc: Jack Lau <jacklau1222@qq.com>
X-Mailman-Version: 2.1.29
X-BeenThere: ffmpeg-devel@ffmpeg.org
List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe>
List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe>
List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel>
Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help>
Subject: [FFmpeg-devel] [PATCH v3] avformat/tls_openssl: fix warnings when
openssl is lower version
Content-Type: multipart/mixed; boundary="===============4552145124083543040=="
Errors-To: ffmpeg-devel-bounces@ffmpeg.org
Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>
Archived-At: <https://master.gitmailbox.com/ffmpegdev/mailman.3309.1750000563.1384.ffmpeg-devel@ffmpeg.org/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
--===============4552145124083543040==
Content-Type: message/rfc822
Content-Disposition: inline
Return-Path: <jacklau1222@qq.com>
X-Original-To: ffmpeg-devel@ffmpeg.org
Delivered-To: ffmpeg-devel@ffmpeg.org
Received: from xmbghk7.mail.qq.com (xmbghk7.mail.qq.com [43.163.128.54])
by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id F07DB68C6D2
for <ffmpeg-devel@ffmpeg.org>; Sun, 15 Jun 2025 18:15:55 +0300 (EEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512;
t=1750000550; bh=GqRHaVdVSd6YVwSHhwmMJaOUeWLJRMlzZcGb5n26JSM=;
h=From:To:Cc:Subject:Date;
b=bzy/11c/SZ/PDhiXn0xh0qe5LSH7WFe1xdW3qF40pdHsSGAmdIjxkE54N6XdFPe0Z
Dgr1NECy2SiXqmbWsMhM2C6vcAcJ5LvYQ6gMILi9o5voc8dKkF5E7AYqRfid65f1my
+zuxjBDuL/Ovij8Nz8olS7EUbK2/blWv71wkkEFU=
Received: from localhost.localdomain ([111.33.194.31])
by newxmesmtplogicsvrszb16-1.qq.com (NewEsmtp) with SMTP
id 3F10F683; Sun, 15 Jun 2025 23:15:49 +0800
X-QQ-mid: xmsmtpt1750000549t8s4oewp5
Message-ID: <tencent_FD0450645A5F2FDE27EF230EB38D7C546308@qq.com>
X-QQ-XMAILINFO: MRkw0hrPPfAMACM2UfHSj8HaLVaecREzMwt1I3POWjSZqxj4i/0DODpVpJ+aOi
urcIjSfIK5FFgQQB+WvjjqVR7eFMk0m1jBgBKdrIg0vJxByuS7RlLfMrw4/c5ntENN1juHM3/j8K
EMY4XL7tK5bHqTMmh1kXreq8uqwp8oEb8q4cSMnzAGAslbpfnyE0NQywz9VGcRUzqYTEorV01HUD
8Oaw8u3JquaqYBh6xIpNvaOkHM8afbcUC/4NG1jhqBPEZKHyTN20AIA2HSb5z9gxmAvOEXE+ME08
kYEW+EbeRHVQxPol+mF43Nwg6w0eHAFpEhmtgUfyWYX/DZcKADydgdoIUcp+HTx7o4u4dFlbOC4t
XBxBPCZmvoMIIR0eMN1A9VWulkaHv5A5e1eXKIrLbPndGoN+9btmZoJVWvxWI2SQvVak13xZI7ve
A+Yl+mQWs0NHGYuSPs3pLfJv7ZykuWn/lY5pZVX2Zsq2K6f5F/oej4DcZE2joeOHM1MhzSo5Hizz
j2DAgAm7wyvn2jOJxSFVugTkpNhYzpY0zTTSSK1T6USngA7LBJ+wEPUDH2lN0aUk/tlzVltw3Waq
vxSHbZ90jhXTgof1452603lfU+s7vjKFWsZdkVLKuxPLC1Knkh75LdB3vMsQ80Y+hf0kQ0GRRjtP
8MTCIk0SrxID7rOowbpzPjI7q1RdYgugN67sQkMOArhJTdJ0mgMvY+/cDv6NiDBVnSaRDr5sreaI
u831RqSY6sOHWKvyUCyHUmrKYrifuc21Paq3LgiGYOm3qHDqczX1ps7Vw3WhTAE/RUvVvd6CEENa
2lF82SRfmDbgXCGSOqG9AB9B+DrnkCk+g3i6rIM60M++HJfFhVzrZlqDLL3O7BAfqNLT6uaYoZMI
QpERtCBPDEi3P4GZsZfRii5g45MUAGUqDOh1GM62eyCZqFYO5d3jOa2XFHsksvK6YUg8noWwdec7
qU15ymdC4RlZ8kW1OyBjB0N+IVXpRF0TusDGffbAJcoeXEG5kuBgWRhzeZ5J9dgOCYDZjfcC0fei
V2jvqKU3R2pkeCQcKF
X-QQ-XMRINFO: MPJ6Tf5t3I/ycC2BItcBVIA=
From: Jack Lau <jacklau1222@qq.com>
To: ffmpeg-devel@ffmpeg.org
Cc: Jack Lau <jacklau1222@qq.com>
Subject: [PATCH v3] avformat/tls_openssl: fix warnings when openssl is lower version
Date: Sun, 15 Jun 2025 23:15:45 +0800
X-OQ-MSGID: <20250615151545.57479-1-jacklau1222@qq.com>
X-Mailer: git-send-email 2.49.0
MIME-Version: 1.0
X-Unsent: 1
Content-Transfer-Encoding: 8bit
api doc: https://docs.openssl.org/1.0.2/man3/BIO_s_mem
In higher versions (openssl 1.0.2 and higher),
the function signature is BIO *BIO_new_mem_buf(const void *buf, int len),
so passing a const string doesn't cause an warnings.
However, in lower versions of OpenSSL,
the function signature becomes BIO *BIO_new_mem_buf(void *buf, int len),
which leads to warnings.
OpenSSL guarantees that it will not modify the string,
so it's safe to cast the pem_str to (void *) to avoid this warning.
Signed-off-by: Jack Lau <jacklau1222@qq.com>
---
libavformat/tls_openssl.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/libavformat/tls_openssl.c b/libavformat/tls_openssl.c
index 86e8935fee..2a3905891d 100644
--- a/libavformat/tls_openssl.c
+++ b/libavformat/tls_openssl.c
@@ -415,7 +415,11 @@ error:
*/
static EVP_PKEY *pkey_from_pem_string(const char *pem_str, int is_priv)
{
+#if OPENSSL_VERSION_NUMBER < 0x10002000L /* OpenSSL 1.0.2 */
+ BIO *mem = BIO_new_mem_buf((void *)pem_str, -1);
+#else
BIO *mem = BIO_new_mem_buf(pem_str, -1);
+#endif
if (!mem) {
av_log(NULL, AV_LOG_ERROR, "BIO_new_mem_buf failed\n");
return NULL;
@@ -445,7 +449,11 @@ static EVP_PKEY *pkey_from_pem_string(const char *pem_str, int is_priv)
*/
static X509 *cert_from_pem_string(const char *pem_str)
{
+#if OPENSSL_VERSION_NUMBER < 0x10002000L /* OpenSSL 1.0.2 */
+ BIO *mem = BIO_new_mem_buf((void *)pem_str, -1);
+#else
BIO *mem = BIO_new_mem_buf(pem_str, -1);
+#endif
if (!mem) {
av_log(NULL, AV_LOG_ERROR, "BIO_new_mem_buf failed\n");
return NULL;
--
2.49.0
--===============4552145124083543040==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
--===============4552145124083543040==--