From patchwork Fri Oct 28 18:42:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Larsson X-Patchwork-Id: 1217 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.133 with SMTP id o127csp1277679vsd; Fri, 28 Oct 2016 13:48:59 -0700 (PDT) X-Received: by 10.28.27.143 with SMTP id b137mr512366wmb.82.1477687739888; Fri, 28 Oct 2016 13:48:59 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id vh6si17268775wjb.137.2016.10.28.13.48.59; Fri, 28 Oct 2016 13:48:59 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6F265689F44; Fri, 28 Oct 2016 23:48:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf0-f43.google.com (mail-lf0-f43.google.com [209.85.215.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1ED64689EBA for ; Fri, 28 Oct 2016 21:49:38 +0300 (EEST) Received: by mail-lf0-f43.google.com with SMTP id b81so63356181lfe.1 for ; Fri, 28 Oct 2016 11:49:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:from:date:message-id:subject:to; bh=hiKLHshSIPdX0hyDILtZyJ+eWfMkH+dhZWZKukMdJ8I=; b=KDwO+lRv620q1KP5P89kPZKJHu78jGvbgLsIqC1ErFA2GBe908DtkpeGlklUvgFt0f cK74SBV6LTKGabrD2jed6De3LWagX3s1q5vWjmukjanK6qG7ijcODlkPPbfSf04T2WLd GZUeVBxHC+sSf5SzIlOVRdyo+vv30XChadsq0eK/nIBUBxklWoAwglw45Bz+yYEs8DfW 0hu7HpxBAceN40uZQd+RHveY0UAuAZrMeBm9aM7NtnZdTkIHg4lat60Jd3UsvxfN4dzI xmqFn03oGrHvJb13oI30/TYUx80LmVhD0oCYsuqt7VtBk1yo0pVHUKE7MrEThL//WLgw 2q1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=hiKLHshSIPdX0hyDILtZyJ+eWfMkH+dhZWZKukMdJ8I=; b=K/jiLGFGNvAiK1n+t3b9La4rmLt4YMw04aotnSJIseuiRqC1F/v+nA8/M56KAHl0db fIqYB6N/Ghstf88Dfmzuuj49KQdiC4WKZ2PXjYuiV1N8TNliYhaAPBkIys856r8It27+ 6OsftMNaZGsLVvEgQ54huQgcC/Q46HXvwNo4yh/+u9WnXhHLe7yfvFKtMwQPHh0M91N4 ngRgRKDT28jyrCzLTs29g35cSUQTihRt7/fZhE+RSi77s0ePC1CjRxSwV8dfh6eeIXi6 iQrABUyoXQJUkWGF4JqM5o5IkIfOEKXeAIKhQjOXHwWV9iutH9NWXVSwHfH94gh9nw1t zMHg== X-Gm-Message-State: ABUngvcYBymgvSlvGQ2pQrE+bG9Ymqeaagd0s0EQt0dNmILKRJdQnWY35hMD3qwgp52Sm+OdDfsCACFf6qX3UA== X-Received: by 10.25.212.136 with SMTP id l130mr11322165lfg.73.1477680141738; Fri, 28 Oct 2016 11:42:21 -0700 (PDT) MIME-Version: 1.0 Received: by 10.25.157.17 with HTTP; Fri, 28 Oct 2016 11:42:20 -0700 (PDT) From: Martin Larsson Date: Fri, 28 Oct 2016 20:42:20 +0200 Message-ID: To: ffmpeg-devel@ffmpeg.org X-Mailman-Approved-At: Fri, 28 Oct 2016 23:48:53 +0300 X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: [FFmpeg-devel] [PATCH] fix tls 1.2 when ffmpeg is compiled with openssl X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Made by vpeter of the LibreELEC project. av_log(h, AV_LOG_ERROR, "%s\n", ERR_error_string(ERR_get_error(), NULL)); ret = AVERROR(EIO); --- a/libavformat/tls_openssl.c 2016-10-28 18:52:40.526626700 +0200 +++ b/libavformat/tls_openssl.c 2016-10-28 19:21:41.520615426 +0200 @@ -233,7 +233,8 @@ static int tls_open(URLContext *h, const if ((ret = ff_tls_open_underlying(c, h, uri, options)) < 0) goto fail; - p->ctx = SSL_CTX_new(c->listen ? TLSv1_server_method() : TLSv1_client_method()); + //SSLv23_client_method allows to use TLS v1.2 protocol + p->ctx = SSL_CTX_new(c->listen ? TLSv1_server_method() : SSLv23_client_method()); if (!p->ctx) {