Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
From: Marvin Scholz <epirat07-at-gmail.com@ffmpeg.org>
To: ffmpeg-devel@ffmpeg.org
Cc: Marvin Scholz <epirat07@gmail.com>
Subject: [FFmpeg-devel] [PATCH v2 1/3] avformat/tls_openssl: add host verification
Date: Tue,  8 Jul 2025 20:28:39 +0200
Message-ID: <20250708182841.61888-1-epirat07@gmail.com> (raw)
In-Reply-To: <20250708180617.59679-1-epirat07@gmail.com>

From: Daniel N Pettersson <danielnp@axis.com>

Co-Authored-By: Marvin Scholz <epirat07@gmail.com>
---
 libavformat/tls_openssl.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/libavformat/tls_openssl.c b/libavformat/tls_openssl.c
index a0fa3285d5..7f10d80f9e 100644
--- a/libavformat/tls_openssl.c
+++ b/libavformat/tls_openssl.c
@@ -906,8 +906,7 @@ static int tls_open(URLContext *h, const char *uri, int flags, AVDictionary **op
     }
     ret = openssl_init_ca_key_cert(h);
     if (ret < 0) goto fail;
-    // Note, this doesn't check that the peer certificate actually matches
-    // the requested hostname.
+
     if (c->verify)
         SSL_CTX_set_verify(p->ctx, SSL_VERIFY_PEER|SSL_VERIFY_FAIL_IF_NO_PEER_CERT, NULL);
     p->ssl = SSL_new(p->ctx);
@@ -921,8 +920,15 @@ static int tls_open(URLContext *h, const char *uri, int flags, AVDictionary **op
     ret = init_bio_method(h);
     if (ret < 0)
         goto fail;
-    if (!c->listen && !c->numerichost)
+    if (!c->listen && !c->numerichost) {
+        if (!SSL_set1_host(p->ssl, c->host)) {
+            av_log(h, AV_LOG_ERROR, "Failed to set hostname for TLS/SSL verification: %s\n",
+                openssl_get_error(p));
+            ret = AVERROR_EXTERNAL;
+            goto fail;
+        }
         SSL_set_tlsext_host_name(p->ssl, c->host);
+    }
     ret = c->listen ? SSL_accept(p->ssl) : SSL_connect(p->ssl);
     if (ret == 0) {
         av_log(h, AV_LOG_ERROR, "Unable to negotiate TLS/SSL session\n");
-- 
2.39.5 (Apple Git-154)

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

  parent reply	other threads:[~2025-07-08 18:29 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-07-08 18:06 [FFmpeg-devel] [PATCH " Marvin Scholz
2025-07-08 18:06 ` [FFmpeg-devel] [PATCH 2/3] avformat/tls_openssl: verify setting hostname for SNI Marvin Scholz
2025-07-08 18:16   ` Nicolas George
2025-07-08 18:26     ` Marvin Scholz
2025-07-08 18:33       ` Nicolas George
2025-07-08 18:06 ` [FFmpeg-devel] [PATCH 3/3] avformat/tls_openssl: load default verify locations Marvin Scholz
2025-07-08 18:16 ` [FFmpeg-devel] [PATCH 1/3] avformat/tls_openssl: add host verification Nicolas George
2025-07-08 18:17   ` Marvin Scholz
2025-07-08 18:21     ` Nicolas George
2025-07-08 18:24       ` Marvin Scholz
2025-07-08 18:33         ` Nicolas George
2025-07-08 18:50           ` Marvin Scholz
2025-07-08 18:53             ` Nicolas George
2025-07-08 18:28 ` Marvin Scholz [this message]
2025-07-08 18:28   ` [FFmpeg-devel] [PATCH v2 2/3] avformat/tls_openssl: verify setting hostname for SNI Marvin Scholz
2025-07-08 18:28   ` [FFmpeg-devel] [PATCH v2 3/3] avformat/tls_openssl: load default verify locations Marvin Scholz
2025-07-08 18:53 ` [FFmpeg-devel] [PATCH v3 1/3] avformat/tls_openssl: add hostname for verification Marvin Scholz
2025-07-08 18:53   ` [FFmpeg-devel] [PATCH v3 2/3] avformat/tls_openssl: verify setting hostname for SNI Marvin Scholz
2025-07-08 18:53   ` [FFmpeg-devel] [PATCH v3 3/3] avformat/tls_openssl: load default verify locations Marvin Scholz

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=20250708182841.61888-1-epirat07@gmail.com \
    --to=epirat07-at-gmail.com@ffmpeg.org \
    --cc=epirat07@gmail.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