From patchwork Wed May 29 11:02:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: sfan5 X-Patchwork-Id: 49340 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:8f0d:0:b0:460:55fa:d5ed with SMTP id i13csp553763vqu; Wed, 29 May 2024 04:05:24 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU9x1Jt0d8+rRggWQn+U3V6VcYceH+J/TiSFijDG48ACfwltaL3GqCtWJqs0vkzwIMU5q7CuQyLw8PLvksqy0RzJ7gsyI1WP/fo1w== X-Google-Smtp-Source: AGHT+IGkoVsII1Ii0RMWbX2G3IURRxV/50QL/KRT6m9/vcJDktfPjMW9ULv9nigc/qQr6Dt7aU8U X-Received: by 2002:a17:906:7184:b0:a59:c9ce:338a with SMTP id a640c23a62f3a-a62641b54aemr1035967266b.2.1716980724304; Wed, 29 May 2024 04:05:24 -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-a63d999b43asi95871766b.134.2024.05.29.04.05.24; Wed, 29 May 2024 04:05:24 -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=rVvoQU0g; 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 1E35D68D4DF; Wed, 29 May 2024 14:05:05 +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-he1eur04olkn2074.outbound.protection.outlook.com [40.92.73.74]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CD17E68D390 for ; Wed, 29 May 2024 14:04:56 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lEf+6FRxKokrKPi/ILbvkfvhKJs6eVRDAzdu0fgrwv3aUcpSCg9brbNl9JP4eg0PvDRnHuPGnLDBhnMgGZpH6QU3ccm1lhn6yxsVU+MDONcqDAEHX0rZ7LSin1uOwXe/19UjFDuRUU1tcvkdW0ecZWUAtPEx31c5rOjJC11UVRU4o/BA4jxlwtUeeuAhwdqCb8UpSn+MUFpfu7Bk57qxGfClFY7DML3mqYQ2iTZ0ipbrDgVFV2X/4Lb9IyvB5iWSJqHwsngnlGxgB758O/uADp7MhxxiBtkGZ+ISwfJDiEReeWi2OekxqVlhJa6ZKzQriVmoKlLN9mH2AerfNiKpTQ== 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=dXuqXtHmgWZXkpFjvAUhBamamaM0wFas1J1MkdSpm08=; b=d3Q00+1IgsTe5vQBtYHLtWiCgNt/QwNEI2+onEKBbrG661jJyu0CnbI2dKtLmH7ecm2I9LVs7VIn52aVdHvqwa8WuiNHi6m1j57lPO/7IeHRRK9EwdG8nmmbKJy72btOd0evl7L1UaqXSdFxdx7iUroCm5wCNo/gWj1BhdJXLY/XSla2HEt26KFmXscaSekR/KzO4R1pbLPgfCJambUjACbF24RtBvWiDqjyLhF+KhSYiXyTGB3Of6kcp/RWJDwDJn0d+L8ObuOCx/vgd3c4B1KpWUHdSnx9G81vUhA4bYZTP5MsOJAhfpQqZTkuh/fbQZWPOvJvoHEniun9s667mg== 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=dXuqXtHmgWZXkpFjvAUhBamamaM0wFas1J1MkdSpm08=; b=rVvoQU0gp3N5jfxV+OVCCvgvRxPnh/VYzxfomzRtR9C4sNkWMtwLwef44lvskwnc/kgoAcsyReq8naKmKrPIiILvZH+VTYlRDfoNBkuwdT4gJnoX82yHzKzSXaFLIOHMD1WcztEZekKMK5xLV8To+wqdjLlAaCIYvg9ewVG5EVYcz6f/e7zD2n76NsTKb8EDeodk6SS01UvWa9Na9KpFZjRgLRmTkf+t6h7kDIhhu1ip5y59rdb5hQrVru0+4bfoFQ3GKPJm6sVI41Kkis1uY0at4xaCR8YEzWTc7k+qJ9OnQIw8kYE/CLIXb3lhm6i+UWTRQIHwWHTmjYRC6MYnvw== Received: from DU0PR03MB9567.eurprd03.prod.outlook.com (2603:10a6:10:41f::20) by DU0PR03MB9495.eurprd03.prod.outlook.com (2603:10a6:10:41e::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.16; Wed, 29 May 2024 11:04:50 +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; Wed, 29 May 2024 11:04:50 +0000 Message-ID: Date: Wed, 29 May 2024 13:02:02 +0200 User-Agent: Mozilla Thunderbird To: FFmpeg development discussions and patches Content-Language: en-US, de-DE From: sfan5 X-TMN: [YVxHV+hbJ10xPk6BMKBo4pV0gjs0gYWiSBCvIHnLlXIPrTE+XL1AMwhMsF9JRMu/Fi2Qpj7a5TY=] X-ClientProxiedBy: FR0P281CA0070.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:49::20) To DU0PR03MB9567.eurprd03.prod.outlook.com (2603:10a6:10:41f::20) X-Microsoft-Original-Message-ID: <30662aea-924d-4c7b-a4dd-195806f991e0@live.de> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU0PR03MB9567:EE_|DU0PR03MB9495:EE_ X-MS-Office365-Filtering-Correlation-Id: d1a02493-ff57-46ae-a0b1-08dc7fcf2938 X-Microsoft-Antispam: BCL:0; ARA:14566002|6092099003|461199019|440099019|3412199016; X-Microsoft-Antispam-Message-Info: Qdr8NlokjOABJ+El1uZy1kntpZ9AonZB2EliiuZWW2bZ5UvOx2y4Fb8JcmK3BtncPLBN64buqdVmMhA5rLlEAlZWbA8VQZ2mIHRdHpkOKUmceQ1m3tFLwelKDXokPMAbKNJi/ImkSOviOh0ymsyM194P39/BvNMjYXtn2eg01CWmLahNb0sKuBoeSkbSIORtIJwuNSOUvTULuf6hgD7Q7lqz4esorqEtctXd5nuJA0bj1fjRzXpqw2643DSzDsyZDi0LSVgS+CGMlFHQ9ysF2YH1sAYSLqcCITga2cPWJbC94bIKiCe8MnLNHRA25n/tsFnGE6jdqXTAwPF0tMQA+0BSf42oRToHECNTeK+mmyI= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?edVCu0r5CqWla7ZtTXsnkj09A1ba?= =?utf-8?q?4lG1GDsqZelhnrqkGO7fcDdUk5r4WfI8BcDHsay9rdO4zYCHmqfyiJVsMB2AauUKC?= =?utf-8?q?RgJYNfiJM49gOiKyYOzvGiqyvx6O5SdOxJbn6R4zPR+EwZmAb7mv/H2RF+XBsTxFG?= =?utf-8?q?x7u/ubTkAP0y3BKAVqKuon7hQxzq1ZPB/HsOWDM8kmKhOquHV6V9BCJNbApwx9WdL?= =?utf-8?q?euG0BnivGwOaU4Ves7RuTUGJPK6i/ssw1JGDaX/4cPugbcLowhOUnYAH9rs/DTQ+P?= =?utf-8?q?QNA8i+6tAe2tZvt57GCjospwXYThL4V2psKe+atjztZ5tu9dMvs4R1hysS5zm0CZ6?= =?utf-8?q?uAXtDAW5//1MkH3XbmS8VkVaPvXfMcruSlgDluQlgLSk7qZttp8ovC5HT8tbYn1eP?= =?utf-8?q?HLGH6R3dvliL+CR28U1OyGtaUPc3cCvna3RBl9Xs877ZxsAY2ykkqKM/Ya/wYZt3A?= =?utf-8?q?ajAGAMcSkb+1hLeVCaueeWI3pM34I/0udCPXNyvljlUC7/f8hHbweLRyO8c//95YW?= =?utf-8?q?nSHjJqx3y2OMqv3BbYtfpxbsaHD8Zf/QLaTmEAVZl0GxUVW8lmTUY9l8YyBNwc1CM?= =?utf-8?q?zNHiJbRxHPzU/cHTltphb4di3Wr0CR8CwT9nslxK9qW9AhZK5fuJ3J9SDwnPg9Dcj?= =?utf-8?q?jlF6FmV0Ki7I+z6XA+OuGS0Jm0qQb7blgJMiI+bhzTFFHppI/RIQemHF1Lkk16n8D?= =?utf-8?q?rU8CPRZT3duL1+4zDc9NGVACw2IdT0tjFzX85/j1E4VDIzwH/f21fRjrJbP/NCk80?= =?utf-8?q?zJDX7CcM4JRofM0YYRZWs9xoGRrLdmtbp/gGaJLQBrZB68apdHI2lw6Vk8yXRpgg9?= =?utf-8?q?RKSsfQGNnjoG49zSWTSyFuiifdG5kxzo/R24ZVqlk0BRdVvRTR9rW45k4uYPT15As?= =?utf-8?q?IBIB5c7hl6ryNQWVEyVrCdmxKyTN5kgNhmZ2uHe8Dft0z/SZvHswL6M46SbS0Z1Kj?= =?utf-8?q?2Xv/pW/+hsRdWDVqbMIs+Tx89fm/YNRx9BTiN7bhucwemuujFm9UfZLDePZqf8IND?= =?utf-8?q?LBcev+w8b7HJg83t6D0j6lP3HGOdW4n9kpkAkBQ+cHWU8XoCka/pFBvxi7BZ1fGOJ?= =?utf-8?q?vZe0zvNJKmqCEshqtJ5j0X6fG6tisnPXrRNG1FeX633+phOEgTIHycBFrQ6inmr1j?= =?utf-8?q?JyKBULRos883+tb2krx2EGwUaq13k1fIVfy+pQ/g4z4zTgl+nKgWIk5A8YYx/6LbA?= =?utf-8?q?WliFb16YM+A18whyfkAcOo2xqg792jg57yOxtzs/iML1nnfSFY/h0Y0QAIAM=3D?= X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-76d7b.templateTenant X-MS-Exchange-CrossTenant-Network-Message-Id: d1a02493-ff57-46ae-a0b1-08dc7fcf2938 X-MS-Exchange-CrossTenant-AuthSource: DU0PR03MB9567.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 May 2024 11:04:50.8391 (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: DU0PR03MB9495 X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: [FFmpeg-devel] [PATCH v2 3/6] lavf/tls_mbedtls: hook up debug message callback 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: bPCsC+5z40Yu From f51387a129e93af13751237ec2c6e25ad07c8dc4 Mon Sep 17 00:00:00 2001 From: sfan5 Date: Mon, 13 May 2024 20:26:16 +0200 Subject: [PATCH v2 3/6] lavf/tls_mbedtls: hook up debug message callback Unfortunately this won't work out-of-the-box because mbedTLS only provides a global (not per-context) debug toggle. Signed-off-by: sfan5 --- libavformat/tls_mbedtls.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/libavformat/tls_mbedtls.c b/libavformat/tls_mbedtls.c index 1a61fc57d6..f53e918e04 100644 --- a/libavformat/tls_mbedtls.c +++ b/libavformat/tls_mbedtls.c @@ -26,6 +26,7 @@ #include #include #include +#include #ifdef MBEDTLS_PSA_CRYPTO_C #include #endif @@ -36,6 +37,7 @@ #include "tls.h" #include "libavutil/mem.h" #include "libavutil/parseutils.h" +#include "libavutil/avstring.h" typedef struct TLSContext { const AVClass *class; @@ -112,6 +114,13 @@ static int mbedtls_recv(void *ctx, unsigned char *buf, size_t len) return handle_transport_error(h, "ffurl_read", MBEDTLS_ERR_SSL_WANT_READ, ret); } +static void mbedtls_debug(void *ctx, int lvl, const char *file, int line, const char *msg) +{ + URLContext *h = (URLContext*) ctx; + int av_lvl = lvl >= 4 ? AV_LOG_TRACE : AV_LOG_DEBUG; + av_log(h, av_lvl, "%s:%d: %s", av_basename(file), line, msg); +} + static void handle_pk_parse_error(URLContext *h, int ret) { switch (ret) { @@ -201,6 +210,14 @@ static int tls_open(URLContext *h, const char *uri, int flags, AVDictionary **op mbedtls_x509_crt_init(&tls_ctx->ca_cert); mbedtls_pk_init(&tls_ctx->priv_key); + if (av_log_get_level() >= AV_LOG_DEBUG) { + mbedtls_ssl_conf_dbg(&tls_ctx->ssl_config, mbedtls_debug, shr->tcp); + /* + * Note: we can't call mbedtls_debug_set_threshold() here because + * it's global state. The user is thus expected to manage this. + */ + } + // load trusted CA if (shr->ca_file) { if ((ret = mbedtls_x509_crt_parse_file(&tls_ctx->ca_cert, shr->ca_file)) != 0) { -- 2.45.1