diff mbox

[FFmpeg-devel,v2] libavformat/tls: pass numeric hostnames to tls_connect_cbs()

Message ID DB3PR0202MB34527AEE7E3CD96534AA5797ECCE0@DB3PR0202MB3452.eurprd02.prod.outlook.com
State New
Headers show

Commit Message

sfan5 Feb. 21, 2018, 5:57 p.m. UTC 
Hadn't seen that one, it does indeed describe this exact problem.
I've included it in the commit message, new patch attached.

On 20.02.2018 at 22:30 Carl Eugen Hoyos wrote:
> 2018-02-20 19:40 GMT+01:00 Stefan _ <sfan5@live.de>:

>

>> attached patch fixes a small issue with the libtls backend.

> Please mention ticket #7029 if it is related.

>

> Carl Eugen

> _______________________________________________

> ffmpeg-devel mailing list

> ffmpeg-devel@ffmpeg.org

> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

Comments

sfan5 March 1, 2018, 5:54 p.m. UTC | #1 
bump, this is a minor patch
> Hadn't seen that one, it does indeed describe this exact problem.

> I've included it in the commit message, new patch attached.

>

> On 20.02.2018 at 22:30 Carl Eugen Hoyos wrote:

>> 2018-02-20 19:40 GMT+01:00 Stefan _ <sfan5@live.de>:

>>

>>> attached patch fixes a small issue with the libtls backend.

>> Please mention ticket #7029 if it is related.

>>

>> Carl Eugen

>> _______________________________________________

>> ffmpeg-devel mailing list

>> ffmpeg-devel@ffmpeg.org

>> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Jan Ekström March 3, 2018, 8:30 p.m. UTC | #2 
On Wed, Feb 21, 2018 at 7:57 PM, Stefan _ <sfan5@live.de> wrote:
> Hadn't seen that one, it does indeed describe this exact problem.
> I've included it in the commit message, new patch attached.
>

Generally LGTM after checking the patch on patchwork
https://patchwork.ffmpeg.org/patch/7693/

Jan
Jan Ekström March 7, 2018, 12:08 a.m. UTC | #3 
On Sat, Mar 3, 2018 at 10:30 PM, Jan Ekström <jeebjp@gmail.com> wrote:
> On Wed, Feb 21, 2018 at 7:57 PM, Stefan _ <sfan5@live.de> wrote:
>> Hadn't seen that one, it does indeed describe this exact problem.
>> I've included it in the commit message, new patch attached.
>>
>
> Generally LGTM after checking the patch on patchwork
> https://patchwork.ffmpeg.org/patch/7693/
>
> Jan

Pushed.

Jan
diff mbox

Patch

From 1f8eccb9450847271dae2543e4d8bbb32fc89161 Mon Sep 17 00:00:00 2001
From: sfan5 <sfan5@live.de>
Date: Tue, 20 Feb 2018 19:18:13 +0100
Subject: [PATCH] libavformat/tls: pass numeric hostnames to tls_connect_cbs()

Numeric hosts in certificates are not very common, but supported by LibreSSL.
Forward the IP address to make verification work in this case.
Fixes ticket #7029.
---
 libavformat/tls_libtls.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/tls_libtls.c b/libavformat/tls_libtls.c
index 1321f7922..ba83b56ff 100644
--- a/libavformat/tls_libtls.c
+++ b/libavformat/tls_libtls.c
@@ -119,7 +119,7 @@  static int ff_tls_open(URLContext *h, const char *uri, int flags, AVDictionary *
 
     if (!c->listen) {
         ret = tls_connect_cbs(p->ctx, tls_read_callback, tls_write_callback,
-            c->tcp, !c->numerichost ? c->host : NULL);
+            c->tcp, c->host);
     } else {
         struct tls *ctx_new;
         ret = tls_accept_cbs(p->ctx, &ctx_new, tls_read_callback,
-- 
2.16.2