From patchwork Mon Nov 1 17:42:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: meryacine X-Patchwork-Id: 31268 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:a610:0:0:0:0:0 with SMTP id q16csp2950311ioi; Mon, 1 Nov 2021 10:42:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxsP5MKUZf7Vd/4/9gaQ3Z8Tlq9djNKs6jLZwy5rzczPA5HISQPBdanOjOLdJj7KRv0egTK X-Received: by 2002:a17:906:64c:: with SMTP id t12mr14941944ejb.399.1635788553498; Mon, 01 Nov 2021 10:42:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1635788553; cv=none; d=google.com; s=arc-20160816; b=dIEz+H8G/VoRJUX4p6UxDF3rAd9eocwr43CNHyHq8LAqvrt3cv/h+xTZNQPXWyjR/u WCbSatVMrO1RgEU9Dcsob14DH6nq4CHoeIb8vLMamooCh+QOP8F0IPp9W309H+cSEJ7l zYll/RiGUqc2rJqFCgQh3qft7VSQ25trUts/Yg2tpy4dGyp/SQlF4ir+p2wYo9EO2Vtv HIOGFrbeZgqMB5UK+PYfDcIvr/5CFKq7owsggaa0M+I4SfSZ+Z2EW7s/xQ+4sUuTySdx 0jbH44+obW6XtJjATMzXKHkftwyuCvoUyfcwM65kBumu5oDbEOTzJTngjipzY309aRYs 8NXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:message-id:date:to:from:dkim-signature:delivered-to; bh=EZ4q+ApwnTUSDOgTdD8FJK4/pf29zbHFO5OzQZEjf2A=; b=s2IXNPC4nPxfhwM8QknJ2MyjMc6TpN5+5dWSUeWdlvdyaeWizHOVW8ip40V8chm3ly +ycb4AnRTNe0GPiEKyjfFVTRnpfukzzDrwDtKA9sE5IEuv1AsATA+I4zdjgcnJrsiuaO 82RPKJJdKc3BFiAvx7qGPhJfPfd9gHckUOIkJdKJF1xhLK4pbcK8RgRjpMgl4WfCF6DB HvyJ5nOshwfrI2DIPUFlgHO0g5dWxquJixd4wYlUgFHSCe8RVydic0hgVRZ936bqa/gk I6PyDLOMjmdP82QH12vRXJALM90XW4Vf1Hs74rVZlIHccTxfMsin3s4a4hz4m95q0bw1 IwBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=UViklUcx; 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 sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id h9si12659080edq.505.2021.11.01.10.42.32; Mon, 01 Nov 2021 10:42:33 -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 header.s=20210112 header.b=UViklUcx; 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 sp=QUARANTINE 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 AFABB68A0EA; Mon, 1 Nov 2021 19:42:30 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F1850680297 for ; Mon, 1 Nov 2021 19:42:24 +0200 (EET) Received: by mail-wr1-f49.google.com with SMTP id o14so29124324wra.12 for ; Mon, 01 Nov 2021 10:42:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version; bh=6i1WNGF8fjKGF/H6aoo/gF5zujJ9eHarJa3bSf43Vgw=; b=UViklUcxqGhe/KnF0Eq2wTkhBFW+H1l2EIx4hI6+apDGQS6Vxzi1ZlW2nnKaYlfx9O RXXT2/hz2/irH/VgS2n47FmbrQL1tYD0lzqY5Ax91B48meR/bVRQI7gRuW5XqknQapAK MOSSAC+b5u3YrGDbVzFoTciCXPbTIGX811S2aA/PIuzNJ6I6jHbvODIy8JTvYl5xlnvJ jzls45+Gz5EejkftdjVRXDBe/PGACDwK4yzU54hRS6Q+rRPpy+Ddy/NdlXJuD9siCnJU SITzfto+zSGFQbCUThd058S2o3NwTSaEXBqFDX8vxPYhdlDdhe7amJKj9LQ4fpNLOqZ7 Y1gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version; bh=6i1WNGF8fjKGF/H6aoo/gF5zujJ9eHarJa3bSf43Vgw=; b=sIruvjWBn2Y2rk3yckBNYlLjWjb6CHFBoLNzZzBWhFf8YRbZHYyfBlkJOf/W0Hbtm+ MS0mfGnEO9w7JmxYV4fdjdLxVcEYjhaUIlCSZ6QdPURcer57WxF7RL5sMdjYnqMr58Os R+v4Br6yfh1icWPn3inWVxFS4ELMUnZSSn/dBpqBhXjgPl7ZVu9l44SC7217r/jTZva9 Drk1gcYURRP7bEhVDFVTeug1QSVCqLR9oSS12cjlzIIk3Lg3Wq4ZlR7TTaNrYeSh015R fzk85cynbF6gTti0Y/INwWp5mqrc5yotE2rXOxAgzA/iYytTYQ9tgOPI3pw8AnrMPSmr +lLw== X-Gm-Message-State: AOAM5316GZshgdUmSeZ8aqyCF0gNaNe1RIK9XUg5jsagC7s14fUXwll2 5XZ8fL5gQC0Uj5ShqeIaJhrZHIPsdpE2vtfW X-Received: by 2002:adf:f0c8:: with SMTP id x8mr22394867wro.290.1635788543926; Mon, 01 Nov 2021 10:42:23 -0700 (PDT) Received: from localhost.localdomain ([156.208.34.193]) by smtp.gmail.com with ESMTPSA id i15sm153488wmb.20.2021.11.01.10.42.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Nov 2021 10:42:23 -0700 (PDT) From: meryacine To: ffmpeg-devel@ffmpeg.org Date: Mon, 1 Nov 2021 19:42:21 +0200 Message-Id: <20211101174221.24822-1-omar.groza@gmail.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] libavformat/tls_mbedtls.c: Accommodating to mbedtls v3.0.0 API changes X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Cc: meryacine Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: fk+DTaFI+1WU There were breaking API changes in mbedtls from v2.27.0 to v3.0.0. This patch accounts for these changes. Changes: - mbedtls/certs.h is no longer imported. See https://github.com/ARMmbed/mbedtls/pull/4119. - mbedtls/config.h is replaced with mbedtls/build_info.h. See https://github.com/ARMmbed/mbedtls/blob/v3.0.0/docs/3.0-migration-guide.md#introduce-a-level-of-indirection-and-versioning-in-the-config-files. - MBEDTLS_ERR_SSL_NO_USABLE_CIPHERSUITE is replaced with MBEDTLS_ERR_SSL_HANDSHAKE_FAILURE. See https://github.com/ARMmbed/mbedtls/blob/v3.0.0/docs/3.0-migration-guide.md#changes-in-the-ssl-error-code-space. - The function mbedtls_pk_parse_keyfile should now be given 2 more arguments. See https://github.com/ARMmbed/mbedtls/blob/v3.0.0/docs/3.0-migration-guide.md#some-functions-gained-an-rng-parameter. Signed-off-by: meryacine --- libavformat/tls_mbedtls.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libavformat/tls_mbedtls.c b/libavformat/tls_mbedtls.c index aadf17760d..0730c2dacb 100644 --- a/libavformat/tls_mbedtls.c +++ b/libavformat/tls_mbedtls.c @@ -19,8 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include -#include +#include #include #include #include @@ -130,7 +129,7 @@ static void handle_pk_parse_error(URLContext *h, int ret) static void handle_handshake_error(URLContext *h, int ret) { switch (ret) { - case MBEDTLS_ERR_SSL_NO_USABLE_CIPHERSUITE: + case MBEDTLS_ERR_SSL_HANDSHAKE_FAILURE: av_log(h, AV_LOG_ERROR, "None of the common ciphersuites is usable. Was the local certificate correctly set?\n"); break; case MBEDTLS_ERR_SSL_FATAL_ALERT_MESSAGE: @@ -199,7 +198,9 @@ static int tls_open(URLContext *h, const char *uri, int flags, AVDictionary **op if (shr->key_file) { if ((ret = mbedtls_pk_parse_keyfile(&tls_ctx->priv_key, shr->key_file, - tls_ctx->priv_key_pw)) != 0) { + tls_ctx->priv_key_pw, + mbedtls_ctr_drbg_random, + &tls_ctx->ctr_drbg_context)) != 0) { handle_pk_parse_error(h, ret); goto fail; }