From patchwork Tue Jun 4 10:26:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: sfan5 X-Patchwork-Id: 49533 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9183:0:b0:460:55fa:d5ed with SMTP id s3csp2586393vqg; Tue, 4 Jun 2024 03:28:46 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVZuPif7QAG0BRgcsEj2gUzVQ1KtpdHqXgwjKAuROXp17BKVzKh4hWvNMDWgezJi2DBbG84MTZYWrAvXszKbSBsTgLrosT6F9atJg== X-Google-Smtp-Source: AGHT+IHqmtDJZOVT0yDuohgk3uxpuRFN0PGLWTPhwfu6nFsrmn+CPjVY4cYkXjkPtMogv/l6kTgz X-Received: by 2002:a17:906:f5a2:b0:a69:edd:332d with SMTP id a640c23a62f3a-a690edd366fmr404604666b.1.1717496926386; Tue, 04 Jun 2024 03:28:46 -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 a640c23a62f3a-a6918ad7465si156548166b.966.2024.06.04.03.28.45; Tue, 04 Jun 2024 03:28:46 -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=GaMm9lUL; 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 6D72B68D6FA; Tue, 4 Jun 2024 13:28:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04olkn2047.outbound.protection.outlook.com [40.92.73.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3BA7668D6F0 for ; Tue, 4 Jun 2024 13:28:22 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=W9tLk2+XTbUuxfYng4sq3R8BbqsFus1DgWZIDKMGMGOST+ryVjf9E8z0ZP4MqZdvhtiua9lyFNIVcfp6U/Nf+vSx7T8CApPuQvFfSPSFd9aI/yOThzbzmVSsfsf2TntBsQQV7tBGbM3qsBomAhZ5o2H/dY/EG8IcuBb1jlLkToLA5e6SGFic3jt/QSGPGIdJBabTyQiv4PwvuKEpTZmTi5mFmLk/sg9TXmXnpNGj43u77uvLKs4HMttHx76l+/Fk0Zkf8/bYCcHBMVtm0zlNj8H31Ps8UCB8IMcwgm4cBZT1F1SACItgonkJdO5z0emnBk5XsOJy9/c1gQeV/i17ZQ== 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=qvALax93dRXddQx6mfZ19Fbeth5NPENcafGfBbMIiBI=; b=YK5jQX7bVvHjplbcV4OionGaHmUDZYcH2O5UWgKBLzkHIPucK+itw4BkQbe2LwzLJNrzSMIja8iOzng7i5teVSVMLCYZebZao6wPq1ecn7Sr5FvaP/RB90/MsGb2lOf0aFTjbLOn6mgWQL+gklkvToVXxq339XIeVNkCNPDVeQXue85KPjB69N1AdZM71/gQwn5wU2CwEkMQtzdM4HdRcwXYQ4Fi+s9mAazngqf/E6b9+qN5XRiQTuwaYpGn480WR/C0mUWoGR6s4vZIpihsbX7pSnMYkh2iTV/xyQWbjSGRU3gStkgZwSmL7vrIPbGza6XgAFTrDF2I14RnVRaBfw== 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=qvALax93dRXddQx6mfZ19Fbeth5NPENcafGfBbMIiBI=; b=GaMm9lULLcgXB/IH7BRapIKLGHcLTFIQKVcSuXV3cd/2n9xjtU8zw4t5m9GmW+LZJ+BdCMH9aXQeZpN3lNPDE9bS6e4BH7vxEb9H+qMgOz8tRn3ucldo1Ojcc6+RJe78QqXxqUHbipWsCzwpNJA2XSlsKsk2FH2Of6SAYINsjRpWce6B/vn8mKR79JdBX7eVrxLvVM2u8DFVa28zHZtLcVzZaiFI7UA4SmyziQ0JuBWnxoKBkqRv7uzRsxaDiUB2I99pX5DiIrHtQhR6hT8vMngmvsbsr4VjY4GSIVDoEKpaf+hthutv5uO2hBNaX3V2N0YN3G917Lqq4CwGGDHgzQ== Received: from DU0PR03MB9567.eurprd03.prod.outlook.com (2603:10a6:10:41f::20) by GV1PR03MB8638.eurprd03.prod.outlook.com (2603:10a6:150:96::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7656.15; Tue, 4 Jun 2024 10:28:15 +0000 Received: from DU0PR03MB9567.eurprd03.prod.outlook.com ([fe80::e356:c67a:e5bb:cc8a]) by DU0PR03MB9567.eurprd03.prod.outlook.com ([fe80::e356:c67a:e5bb:cc8a%3]) with mapi id 15.20.7611.016; Tue, 4 Jun 2024 10:28:15 +0000 Message-ID: Date: Tue, 4 Jun 2024 12:26:23 +0200 User-Agent: Mozilla Thunderbird To: FFmpeg development discussions and patches Content-Language: en-US, de-DE From: sfan5 X-TMN: [1IAceV7Bj+sMophl50WDVVa7/+QVFkJjv42UCU/vUj6uQNSqNqxaaMDnw6bR2fpd3ssrcD9na+0=] X-ClientProxiedBy: FR0P281CA0065.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:49::18) To DU0PR03MB9567.eurprd03.prod.outlook.com (2603:10a6:10:41f::20) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU0PR03MB9567:EE_|GV1PR03MB8638:EE_ X-MS-Office365-Filtering-Correlation-Id: 10c4c142-c3c8-4b2f-dbdf-08dc84810ad0 X-MS-Exchange-SLBlob-MailProps: VTa9p188PROa+hh+zXRdb8iH1LoS7wEl7qV/8dxe/tLgdV4sZ7yMeeQ1W9G7aATlc2vEcEPUaF0yfsOtaR6d1tINM58GfgHjD2RdoXn9e3wKN5HGR81kvzd3aGR38T0ivSskZja91CfSpk8vhWtKF8dKT6qaFV03fLmybQaOYuTIJYbAply9AhrWsdXjE5KA0eqyMB7p3d0zFzhrmi94du7lc6+R6m0sMJnAhxnujTDChAlr7TxdAomL/2uQmYoQntJq9wcoKBLVlgB3qKeeb0FYEWKf+kFm1L73arYxkAV0MPN40l42N9esJQpsx7+BG81W8pja9nKjWCp3Aqyxv08rnKKVB/Q3toN8DtGRa7HrLRZbeyuErc41glxmIe5Krjtgt48uBEsC4J/h9RoJ2xYgSqYr2N2D+o2WvHgUXfgL9I7QK1ZAAhwyXnp7FNluOM76xSvEIftLO4hci0sICH2ggP8ZLONkD6fhKqDDzXxl1TGOM/PU0+F4HJAnLsSxqmAoA2INccYj3TBdBDjF1pidshiRHI6ejMDFFKCKln1zsjPJuGE0fpp77rOBh6zEWbLJR8zawNN4awpyTR3td1WuSG5sDqFCkB7EVrR/zQa9QNXC5WjDtmANS/eSsOlU X-Microsoft-Antispam: BCL:0; ARA:14566002|6092099003|461199019|3412199016|440099019; X-Microsoft-Antispam-Message-Info: WEo7Hd7LXRRFMh7ctQcsZYXRQ8jjgzpyaHeHvYR5YyfVReWlHcZ5TFeSHTw8PMe+Uf2x7s/yqZAsfQzV69JctLge9fHLBdurQQkLp8LuDTVO0adaHCeg6rlDSxCN6qTTRqlQfz2zOhOxYSpLMS3E4ZhC2vkNgRFQhLOU/efANUM+EaPAZN+CLSpYcQzPJ1luwYYehE8IEsVKJt7rTA9kSS9/Cu5QL7gOQiSjvRcIXuQTg7TSLH/tHCkLvUmkvkoNNdar1hzx/YZK9SZXv9OgQMQpSpYd2R2au0o6FdF3WgawsQd+ydCqG6H6a0UZiXpQFdKQ6DuWIE54L80aAFjZNh50Ar8rOQkup/dFa3OsPSg= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?GoAneaVjYxigNQlA91+6F587K/Hi?= =?utf-8?q?0yJ9ikTRxWGDTA5dpN1tJjQQ1l/+0ngS+72QhY/OLAcGNfzU66WsqE79Uy+E6mT6D?= =?utf-8?q?Diiv9TinpVCfxZ8qfbmuiBK+aI/7MFdZCUKKe/qWSrmab714z0smMla8ogzkgWbMg?= =?utf-8?q?5JNAyc+JzHQ7WwGEnbv7HmK1LXYpfIVuIMd4Z5B0xqNLghwX1nN29sJamIwJ/fIPP?= =?utf-8?q?tZIdM+2YkSx2+OWGF22wjg8ksij1sT2VXpukCTaRJBm362qTt/qrdw18r5B0XVvwQ?= =?utf-8?q?w+NAqYMju3eeZ7Ierwm+OVXjbV9Sv+kvhRre0ffTkFcjnR5CYqh2PY4YCYeeMJzxj?= =?utf-8?q?1UBSo704kFsVrj9uXQ0OO6aziBpkUQ0YISV48KIdYwRxJ4RQSTq9DPJIit70ECCpE?= =?utf-8?q?3WpKRhi5NyMHy5R5NXFwB/b9joQ+MHOjNtl9d2Y6uMkHIdPlRazoBdS6dgQxzOm9o?= =?utf-8?q?Vay+N0l7f26+S/X9LUz+itWS/l0OE7XZ8jLse2XN6WmTGYO2FQ42yaV6ZbNwoYyD1?= =?utf-8?q?a7U4qx+nYHMdSEyCC0yNMurq4KHzZ/Hiaq27CpMmcG+Z5VuIuhdRfIl7T1dd+7BLA?= =?utf-8?q?8gt0C6hR4Pv+y8A1k1WBhkY4OZwIjrTyPSEesdTzcvvgeYQtCYHHNGT4AwjUQiXzq?= =?utf-8?q?eLN4Ys1HksmkqLF1ENSfzoRhgF2kTkqp2FVHUxPNTvi2gYgE4ahceSmO1on4gFAPU?= =?utf-8?q?Lx2nNMHQqd3h/kirFYJsYH0ovCGwZhEVnl/9GWIWhmvOwCIxl//Xh3c7FGyYSSt9/?= =?utf-8?q?oqe6IbJZw31VHYil4TqnWyBjyY5KuuUx94tsU9/6nbEA8sBtRSDAAu3tJpQgGtpP6?= =?utf-8?q?vqURXZjwJuykPdsCXGHKonNtmFURqC7xATKQbQKrWFuQUIaiHbWhCTdJa1xAyn3Jy?= =?utf-8?q?TNwOZS3dP9x1EVdbWleFaObnW38l/Z3AvdTXgaYIKsNyLPmRkFv4HlcgeQ0xWNXm7?= =?utf-8?q?c6HSrTs8lqtl72YY9rIjZYa/8NakL61iDgTyJABb8JyfLGWOu7S4oivrWOp/cEc0k?= =?utf-8?q?3qBkS3G1FqSROWFR4K3KXE0DUGVF5WiRc0oco0kQeFf7De9ajz2X5r5Imoozrda/j?= =?utf-8?q?jEqodBnPzAWeYL3ZbxF5yYnx1PzlbHMDpIgWtZT3tE3PPyMd3rnMUxGAUwFQ11z9o?= =?utf-8?q?e6yP2UhTL0o62uDvXTZZvl3+vXiWOfGrFtGU6ICSk8A3k6F9q+ZKyGvc5Vg0g4Kvt?= =?utf-8?q?UJFJKOJIeEYBT8m7uP6x2ME1sUD3ic3i7I00AGgPDb2EY0ZWJR+mp1OCgpqM=3D?= X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-76d7b.templateTenant X-MS-Exchange-CrossTenant-Network-Message-Id: 10c4c142-c3c8-4b2f-dbdf-08dc84810ad0 X-MS-Exchange-CrossTenant-AuthSource: DU0PR03MB9567.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jun 2024 10:28:14.8759 (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: GV1PR03MB8638 X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: [FFmpeg-devel] [PATCH v3 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: rkqqkGw0bTSL From 8b2cab9a0ad225fc2b13850ff1bafb45d3d8ebaa Mon Sep 17 00:00:00 2001 From: sfan5 Date: Mon, 13 May 2024 20:24:43 +0200 Subject: [PATCH v3 2/6] lavf/tls_mbedtls: add missing call to psa_crypto_init 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(+) diff --git a/libavformat/tls_mbedtls.c b/libavformat/tls_mbedtls.c index 02f08fddbb..0d14e9f814 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" @@ -187,6 +190,13 @@ static int tls_open(URLContext *h, const char *uri, 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); -- 2.45.2