[FFmpeg-devel] [PATCH v3] avformat/tls_openssl: fix warnings when openssl is lower version

[FFmpeg-devel] [PATCH v3] avformat/tls_openssl: fix warnings when openssl is lower version

[Jack Lau via ffmpeg-devel]

[-- Attachment #1: Type: message/rfc822, Size: 4088 bytes --]

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
Message-ID: <tencent_FD0450645A5F2FDE27EF230EB38D7C546308@qq.com>

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


[-- Attachment #2: Type: text/plain, Size: 251 bytes --]

_______________________________________________
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".

Re: [FFmpeg-devel] [PATCH v3] avformat/tls_openssl: fix warnings when openssl is lower version

[Andreas Rheinhardt]

Jack Lau via ffmpeg-devel:
> 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;

That's what I had in mind.

- Andreas

_______________________________________________
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".

Re: [FFmpeg-devel] [PATCH v3] avformat/tls_openssl: fix warnings when openssl is lower version

[Jack Lau]

> On Jun 15, 2025, at 23:54, Andreas Rheinhardt <andreas.rheinhardt@outlook.com> wrote:
> 
> Jack Lau via ffmpeg-devel:
>> 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;
> 
> That's what I had in mind.
Thanks for your review!
If everything looks good, could you help merge this please?
> 
> - Andreas
Best regards
Jack
> 
> _______________________________________________
> 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".

_______________________________________________
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".