From patchwork Fri May 17 08:34:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: sfan5 X-Patchwork-Id: 48944 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:3a48:b0:1af:fc2d:ff5a with SMTP id zu8csp2735855pzb; Fri, 17 May 2024 01:36:16 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVIAGmq8P9HUbQWBOpsAodDPA3MkycCWgYgicwCjRzGIERMgMqzjqQdr3Q+Hk2bhiW6t6b7B2NzHW/IPiCz7FeDIj/0CE09zWL+Pg== X-Google-Smtp-Source: AGHT+IFusblmdfSkNmGm4dhhKfQWoFoujmazGRtLzIHVxwgPV0ad5iJlIFNStt03TX+dsGTNcExP X-Received: by 2002:a50:ab02:0:b0:572:a06e:e406 with SMTP id 4fb4d7f45d1cf-5734d6f6e3cmr14866866a12.33.1715934975967; Fri, 17 May 2024 01:36:15 -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 4fb4d7f45d1cf-5733beacff4si9468037a12.21.2024.05.17.01.36.15; Fri, 17 May 2024 01:36:15 -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=@LIVE.DE header.s=selector1 header.b=pEwZdedc; arc=fail (body hash mismatch); 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=NONE dis=NONE) header.from=live.de Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 50B4F68D38E; Fri, 17 May 2024 11:36:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04olkn2105.outbound.protection.outlook.com [40.92.75.105]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E4E1C68D36D for ; Fri, 17 May 2024 11:35:59 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Bu0BOGYXl84OqYWXeJKWVi+twxQJ6Kq3XD0/mSP+qdAZHOuqYfFfdmlJQv6aBGhp8HLAyHxf1OjAl2eby2oyXn7423Fu1AO4YrFIAveJByzoGoDJzI4YIyQqis4yC6jnNJloRGe6JJKfZkpGPKojp0AZ3g8OmmmaYbwD2Qx1U9JJU7vDe33Rv8bbd79k44j/Hz2Qc5HHC8YwDxBYgoPj0Hll8GxmTOUMnGTxZyFWRbDpOti/yiF1FJlIwGREwhbDPzbQgJBn3h3eI4C5MsuEF3PqXr/zIxTYeJJG8l6hIyFbMo3ErehdyyeCZOQ6KgcQLbR+LAX1RmVjWR9MqtCudQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=PMNI7aF0/QPBE+ZZKfzcM3ti6BaqHq59MKmQU2IqaRE=; b=UVTCXE7ubKiuyS1T2a76ClN5ai5/9mwWJWPlaGVFiSki8B3pbG6oUVYJp8a2zsgNBAfa1B+NnitemsnWN9stiRJjS/KzzmbVWmf3xoGBjrl7Mc1NDKzW3GqFjkoiwYmn+MdC/1xBxxgucFvvA57pPkoMPE6mGChkrbSxIW76tf4hXwbOa0KwehzvL+41qOKDeYXvUG9TtZQkS2/5eLHPMW5+ZtTC8CcXITMusTnbItzr2xwPxJ7+8zuPTBk2vUu8tFfs7b/nq63N7X8zRP8Z/FYWv59uL1e2f7iOXYB9IvMlIXRToIF4x4z+blqYj3NnrscL1Q1FN43mgqkMVEEGfA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=LIVE.DE; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=PMNI7aF0/QPBE+ZZKfzcM3ti6BaqHq59MKmQU2IqaRE=; b=pEwZdedclDhcmtEh7DTc27smC1pEtXIkT2YI0upqQZ4UNuxGQVGUp7h+BTSivcgaE/6mj4h4XdDI2BgnEszzdYFYmDZC3b7ZVzj1Y62JRdeb8yitwhuhvJZAArw+a/lqB19aTysp6DcYVSfkrzVUiGuxYWSQVSA9yIhFvr3eJe1blGhHnYLgOcdOf4ibS+MQKAgVWTIXmwJLMn4XIP3uXiypT3Sr4f6tkR+I/na2uudDT0jQw/gh9vL7dhU4OCk3K7k7hSMunUOXONIhzXXJoEMPQWnMCxCaUPb1lXDvvrDxXc7F/acskweNfnSaGPFk+kLfrMrWBSviTDaDXCJQuw== Received: from DU0PR03MB9567.eurprd03.prod.outlook.com (2603:10a6:10:41f::20) by PR3PR03MB6442.eurprd03.prod.outlook.com (2603:10a6:102:70::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7611.12; Fri, 17 May 2024 08:35:54 +0000 Received: from DU0PR03MB9567.eurprd03.prod.outlook.com ([fe80::11d1:a48f:e0be:fc9f]) by DU0PR03MB9567.eurprd03.prod.outlook.com ([fe80::11d1:a48f:e0be:fc9f%5]) with mapi id 15.20.7544.041; Fri, 17 May 2024 08:35:54 +0000 Message-ID: Date: Fri, 17 May 2024 10:34:30 +0200 User-Agent: Mozilla Thunderbird From: Sfan5 To: ffmpeg-devel@ffmpeg.org Content-Language: en-US, de-DE X-TMN: [esAukPqkkurNs7bS4kX4xjOuQTK5PkSkZLZRRKrIUVRkyVo2uzdbnjY1wQJQ26ZML/MvvEKruQs=] X-ClientProxiedBy: FR0P281CA0247.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:af::16) To DU0PR03MB9567.eurprd03.prod.outlook.com (2603:10a6:10:41f::20) X-Microsoft-Original-Message-ID: <951125ce-b902-469e-9457-5045f7314e74@live.de> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU0PR03MB9567:EE_|PR3PR03MB6442:EE_ X-MS-Office365-Filtering-Correlation-Id: d8643663-75c1-49c7-ddb2-08dc764c5d13 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|3430499023|3412199016|440099019; X-Microsoft-Antispam-Message-Info: 7A9vuof7t/6q4OYo6lj0TFucee7uxTh1Itc+Cqbr3mwUe5xCis5Z78TC72DuJQrQDI8oLke1nJo66DXHWRzxsL4KCSNqjOCIFrMY4wopjQwNvI8M6T56lgFDXTIUsEo39D8n0io4+oeEil2DijgZDAwuSO5wwpZHSuW/8L0LdnrlM8cXNjVi+F9cg7tM93WFNJJT3QAeS6WY/+zdIGhXqwMFXf9dcGzG01zQjKWhFl8g+vl79LSm4yEs2nExDzo43uBzwZpWsApTiYoVdERo7gksAoVSuKtjlURzcKTJrLkVaKnnkhNU+LmMYUSf3P7mrUpbR9TSo9TuSA5WcZpa3KpjoDM/O/N1Us7tY8cA1+quid4TGuwlnOP4/eEF1nrbBud1V5RI2OpR3MOUv/s1798MEaD0rlx4OaSaA+z1q8NsPlQ6N5wCdRJNXXBmXqBY3tifbPHFPdB38SNUhmRi1YPN5r5r6vC14l6DElHRDOnxEMTDxU3UAJsv5/p4vZ8HSU7Qp2eNxI7cR7y8A3Mdh7uUsvK9d+ouPhlTyi7HTy3ywnQfQvSxa9MxzTX4Wk1+ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?cYe3oY98JWqoRHJG+8QDbTTiCL5g?= =?utf-8?q?eYN2QaDIXN/MjioVpVCNNwXBuf/zUWZjYx0xYxOnjh5zsf0barlUcS3DUj3dJPXXD?= =?utf-8?q?IoPATzOqX+wBXyDjRCy7XML3f+H7hVR0uMjzVZk49d8YdQGRKyveeLL12To7UpZXK?= =?utf-8?q?oT/4DRjlcTdMMwVKplCGyNWrnz2OPKjaHofEMXS7kaK5jNADRbGPU9EEDNEVQCEF4?= =?utf-8?q?Xt2vTAmlRqb951KRYVGb3+AMKvrcBQWTru3XhSp0hlfbBzwCXu1Vs7klKDXurJ1t9?= =?utf-8?q?LBfBU/atyFzjUYeE5U3ZUbO6QVD2u6BBLL4QahbN/jZ0QmAlmM/SnrtaJSewlrFh5?= =?utf-8?q?3I/P/joRLGHHsir8Lyo4nK+4kBIwldBmD6wuIUIYXDBqh/K7mdiS6CwJ3CZAXVzcj?= =?utf-8?q?86DzvMysJZO+74A60ZBBhehIOPzydaihPj8MGLh1tqWRpzBAXu1iievN0zhBv8tzP?= =?utf-8?q?Aj8u6aGt7zrUxBu6TCH4HpnOvWERrOkjX0Pq5tOxFDIdeq9m676FunDCs1QNAhDXU?= =?utf-8?q?/WPD/L5Rb8TBsZlG0nAZLdOk9gK5DzaG2/S1jnfVdckglg2eG8gqyngBVpQ8IKBQU?= =?utf-8?q?S8AXmfQ7nk117rPSt/o+d9S5kky68WgsBO9YotovtgzLZSY01P/pV/6slpH43vInm?= =?utf-8?q?yrRwkCxMPTvGnuwOzjVz6tmlsPtIvZnUL3UkYfYuFzpZCbznMZNGyg9iwyvA8E54S?= =?utf-8?q?yPBVLQ+IcmJ+QvnO5OQ+SVP8FZbt6VEWSkLosR/aLNiYTcA/SJH8TpRriuZv0udf8?= =?utf-8?q?MY8C0C/B7V3RUXzeHUIvUE4vVikDYREoc8bOI7kY0Tlrtch4z1xVPoum8vQ6ntQvz?= =?utf-8?q?hF7gQwGkHAqbZxX8W8jjWp+cb+iwvW7oFWBH7SAb8AL0Nf4Y0CuULQwNy1qFKJu7v?= =?utf-8?q?6xCFYh7BzL5jbt9sYfYV1HLZUoH3h8PsYFkhXr0udNfFWmfvvJi9DOkh2cfjsDq2u?= =?utf-8?q?ASUc6eOZ/MUbXsyNc0OFbv8y54HdWLSGRlaS/pPOm06UMEtvxwe9RIovq6Jjw8CHL?= =?utf-8?q?BqM/bj57y6GDjF+at8PJ7NJlD5eKg8E/+UK6B0BFpjU/rChgafJ2i/XxHOf60o9TR?= =?utf-8?q?j/lVCqv32kMJnwn5VVCaJHmVlDaO7Riic8NQ1abykQs+Y62u44+kdG38xLyOsInY5?= =?utf-8?q?ftRv8tFPRqelK04VtkCUdHVH215KNfZNGImT2u+vbS8Fq/bHaJ1aGKxejSBkJFFbS?= =?utf-8?q?O7nFzwoaipdCsgq2ZgNaGhZxKPuEx3ERw6jqiZLHD3nuT9kYR+M6GRq9AXY4=3D?= X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-76d7b.templateTenant X-MS-Exchange-CrossTenant-Network-Message-Id: d8643663-75c1-49c7-ddb2-08dc764c5d13 X-MS-Exchange-CrossTenant-AuthSource: DU0PR03MB9567.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 May 2024 08:35:53.2921 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3PR03MB6442 Subject: [FFmpeg-devel] [PATCH 2/6] lavf/tls_mbedtls: add missing call to psa_crypto_init 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: z85X9oEbJeUP This is mandatory depending on configuration or at least with mbedTLS 3.6.0. Signed-off-by: sfan5 --- libavformat/tls_mbedtls.c | 10 ++++++++++ 1 file changed, 10 insertions(+) int flags, AVDictionary **op if ((ret = ff_tls_open_underlying(shr, h, uri, options)) < 0) goto fail; +#ifdef MBEDTLS_PSA_CRYPTO_C + if ((ret = psa_crypto_init()) != PSA_SUCCESS) { + av_log(h, AV_LOG_ERROR, "psa_crypto_init returned %d\n", ret); + goto fail; + } +#endif + mbedtls_ssl_init(&tls_ctx->ssl_context); mbedtls_ssl_config_init(&tls_ctx->ssl_config); mbedtls_entropy_init(&tls_ctx->entropy_context); diff --git a/libavformat/tls_mbedtls.c b/libavformat/tls_mbedtls.c index fd6ba0b1f5..24c3afd94c 100644 --- a/libavformat/tls_mbedtls.c +++ b/libavformat/tls_mbedtls.c @@ -26,6 +26,9 @@ #include #include #include +#ifdef MBEDTLS_PSA_CRYPTO_C +#include +#endif #include "avformat.h" #include "internal.h" @@ -184,6 +187,13 @@ static int tls_open(URLContext *h, const char *uri,