Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
To: ffmpeg-devel@ffmpeg.org
Subject: Re: [FFmpeg-devel] [PATCH v3] avformat/tls_openssl: fix warnings when openssl is lower version
Date: Sun, 15 Jun 2025 17:54:11 +0200
Message-ID: <AS8P250MB0744826A2E9C1D264A55911E8F71A@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM> (raw)
In-Reply-To: <mailman.3309.1750000563.1384.ffmpeg-devel@ffmpeg.org>

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

  reply	other threads:[~2025-06-15 15:54 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-06-15 15:15 Jack Lau via ffmpeg-devel
2025-06-15 15:54 ` Andreas Rheinhardt [this message]
2025-06-17 14:07   ` Jack Lau

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=AS8P250MB0744826A2E9C1D264A55911E8F71A@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM \
    --to=andreas.rheinhardt@outlook.com \
    --cc=ffmpeg-devel@ffmpeg.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
		ffmpegdev@gitmailbox.com
	public-inbox-index ffmpegdev

Example config snippet for mirrors.


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git