From patchwork Wed May 29 11:01:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: sfan5 X-Patchwork-Id: 49338 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:8f0d:0:b0:460:55fa:d5ed with SMTP id i13csp553482vqu; Wed, 29 May 2024 04:05:03 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWBmJI3nTiPDjWloQprfJ7zd5GjeINi6SWDQqilW1OPMq+wfcOfZ2EW0YlDOwkLfl1p0CyKhw85HHOH1OKv7C2RsDZjI8BVX7drmQ== X-Google-Smtp-Source: AGHT+IGKr1JZ2/j1Pugz2gyc9msYPTvANrqqTonzl7PZKjGg0TeQPeIVJYneijAz8E23d2bpH0hr X-Received: by 2002:a17:906:1d50:b0:a5a:8cc0:8c23 with SMTP id a640c23a62f3a-a642d954de3mr153476966b.27.1716980702773; Wed, 29 May 2024 04:05:02 -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-a62ddb069bbsi396261866b.101.2024.05.29.04.05.02; Wed, 29 May 2024 04:05:02 -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=LFxN3c31; 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 9B98568D3C6; Wed, 29 May 2024 14:04:58 +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 909CD68C0D7 for ; Wed, 29 May 2024 14:04:51 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jdTuglqX7GRs00qnfcC50ak/E8+JB74Jim8flSBtO+ZK4jmmK2PNlF3A84qq57jECPYcT0LuaoptPbG1OIgvyPAwqHFPm/Jt0QwebvCVrPaKMpX4YyiimoYH+hQjMtXDuj0nIlo3I5AQhOHPia8syfI2Lk7oLgL7Qe782AlniwxTAuqFgbz1FOTApOwwBBBOLf2ZBjtDT7iEtriAY9I4+bkuccuCL1zklILbh36fkixpHb75QArGCMMbtCugeqNe/5Sg/WbTvkv5LwrOCKzxuIvQjKxUtS7ccRyyrJJUiet0Ul3XdlE59ddHtNMHSvD6K0biJ3/oK0Macc4h/H/5pw== 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=bLb+1yN1GsksTW6WZyIWnuTMIA7+fplTuFCDGvYScVY=; b=Uo+wysKFwGQ72mF9VFfTdTKna+zwU6gZXhHu4BYOQ2vSDt+lHLeTTsSWlB1fu/1rqa5mbI6WSRaqY5O0o/gNmPfrSQsREz38tkEDUwhNeVHgwWaPcylFqmVZy6xHl+syfWOx0dEga+lPfNyQINS0ubVf33rynS6sH/gnm2qapJmEPM7nl4EKCIMHNRz1LZLm7wbrmdHWun/s2HZXuz+eNAUH+kMcsUdB6BaC1ijZWfPgXlHOkZg1sjwLlsJjhKUi7c943WKwSxQeGg9A2NJhsjlDPIcXq2CGYuTFenj+aBBqwxmzLicc28Fadw5C66REm4BbSrA8oD9ImYtYGU4XpA== 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=bLb+1yN1GsksTW6WZyIWnuTMIA7+fplTuFCDGvYScVY=; b=LFxN3c31B5PvxMm7poEFxNAUvC2qVpCmu0HcQCyjrWML0jW2/kKNGN13oHjHMRKdcYQlsTrV9JA28ZnsbU6V3ZDHM0F5Dh5SEHbU62ukmxvnatbcpwpzPrFWMlcSaSfaJBaHFrmWkaoPJLWawnIXIsyx2EVLGf9Dmmo3q5yme9Bqai63rURtKy6shPM3zmHPXbXP0KU0TNPU/2QHwXGX3nNaV3vSJ0tVxiIXImZX1sKXu4FmJLIiDpK4x0yOalwv3C2+Ibz3K6RDE1N9ocP6yPE1QeQxXlI98j2BQHSK2qgLSDgJiMBlSYjz9bcwUAYlo4IcgJ0U10/fKKblL+Rvaw== 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:49 +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:49 +0000 Message-ID: Date: Wed, 29 May 2024 13:01:22 +0200 User-Agent: Mozilla Thunderbird To: FFmpeg development discussions and patches Content-Language: en-US, de-DE From: sfan5 X-TMN: [3StbjDI+21rKpSL8wLB4WGXQgid4+hW/ZTlLJsLauuBtZX55B2FwOfvD2O9QrfdGzaf2Reoqb4c=] 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: <355f9811-cd12-4b57-b9bb-46bb54754b68@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: 45ca1e75-c936-40a0-b305-08dc7fcf2807 X-Microsoft-Antispam: BCL:0; ARA:14566002|6092099003|461199019|440099019|3412199016; X-Microsoft-Antispam-Message-Info: UBJ6wXmpty4+pdahkFnv357vIggFUCXMmSz0vbF+P7UgmlNHOquDFE8MiFtpTB9nsxqQZxX4UCkBaj2+SlvwhxJTOQMZGSgVBOm9wEm9KhIfuTU6jRwFUHrOWLIPDsbbJcEJDNmij6x1h29aflg/RjoPTgZ2sje5Yw8CRYdgX4ZnFal1L7K5yNowAwA8vV2TCy1+FH7YK/uNzqFiehyp8BtpgIsRcItTqzY58e266NqoC5ksI0EaZgOrY+ISWjaL/YrltdcSGjc5lU9IjcGbVqpdwwi+L/2mouAck/6/QR2tgZbgz796WSYrEZCSLqe3GrE/3KcyRD4S8LchLplv83lYf3qRRbAYmKWuWQW0ILw= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?URVoy1hFbPGpogQunrXt+ZzAAMNT?= =?utf-8?q?nYK+yZccYGdsleT9jIG7bLedS6wgpbNS3uTcyb9SAfiRSCIqf3pvgQ5GTk4u0ds9n?= =?utf-8?q?l9N6VkpVg0zhFPcYoOFLJJr76SvUHgPfW1RsaDt4jdeYIXTc+6bDNkicQfiqbGbik?= =?utf-8?q?DEV9K838u1t3Yt2fCKDF+f5HLzjZg+NN0CuJOyi4Gm1k8aAMgleHHp7DNAWPYsdln?= =?utf-8?q?ivOvvnnAvdKFnBm2FhaA/QaCSxNmBEHNaAopoEwfjSa+ryZgQ8k0DRJwLQeYsiyeA?= =?utf-8?q?e4XIGYYhxw/JYAN47821l1hfOep9Zj9bzc/H/EbHqC1OCtg26KYm6RgipkBHAu0tT?= =?utf-8?q?66Fc6GMtM0WDy4JLqIQpRGhbaGKM5BkvmZQ8pAduKOrMJqrj/zbcjAX2wf5v4fFzD?= =?utf-8?q?pLn7cWYr50J+cy8oXkR3Z7wQgHWF2x5cE4pwevm2K9VP4glkqX8wfUtxRD0iuiU0G?= =?utf-8?q?n7o1xGayMoXl+GL2zKp3KPo7uYkvx72ya2hJbkkZuN2G3bTQCopaIJ0U/nK5GyW8T?= =?utf-8?q?sk7WZUDk2cvNFRXH9fVniaaYNQ5EaP44NIjOqxri/bLYhErJCQVMSAfw+5BWEif1g?= =?utf-8?q?GI/t6kPXBB11J5mHL+A/P2qhi+Ymyk1RUAa0f9fsctZyNVwtoICHCBcjTX8CUiI2E?= =?utf-8?q?WVOXO3O/Qe2McvF4XQ4TUENWXtf5zDHBXqAeihL9p8Pk9EOXXct56Vwcsvy1DOO75?= =?utf-8?q?QP+RQh3oxB91LeAucBP7rEsgTDzCG3dc8puWvuKYMaIF1XnugjGJFDyppLz/yavbF?= =?utf-8?q?Edr7VFZAv7XiWLU9oOtdvGul1hd03DtGqsJzFtzeNh4uHtv0tKjAaYU3QCqzB7J2q?= =?utf-8?q?d1X8nMMBAu0ka/vJZHdQrRBunDTt7IcgHlpG8aMHHgojbVtLJkf5wn6JHzwI8UoyC?= =?utf-8?q?TjKIW/DmfSNm+jIU0m7JFmaGLJ0yrzfDMCT/zTfoPZvekeHWmL+3dRSr1QclcTxsG?= =?utf-8?q?vdyK80dTHcXKk/pJzMOpBqZI6V8Dsk1b0Q8U+d2lAlmF3I1GJuOykgv4KDp50jMxp?= =?utf-8?q?GzEB/prLCwPOBvY7t+eIF+8c/6Cp/1pDVdzcsNhOa/UETGj1JmcN6ByKRN9hL5vjk?= =?utf-8?q?XI33jOy+4M2n303MnTVr6bZx7HC3AfIq8I43BN1nKAz8WPbfs01JqcASmPsf739si?= =?utf-8?q?EpjZC5zuMDubqEv8mSPXoriMApinRYPmLZJNLIk8oVkJBlQ9jc0+BFdSprHV4G8Gk?= =?utf-8?q?XI/f05eippJQgra8eF6TDTkH8DxTuF4yYYg/ljY84bDI4EqB32sNdWMieyUo=3D?= X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-76d7b.templateTenant X-MS-Exchange-CrossTenant-Network-Message-Id: 45ca1e75-c936-40a0-b305-08dc7fcf2807 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:49.5317 (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 1/6] lavf/tls_mbedtls: handle more error codes for 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: 1KeGMA/kq226 From e8b5b6dee2d29690d1ae18090659120399b84e7c Mon Sep 17 00:00:00 2001 From: sfan5 Date: Mon, 13 May 2024 20:22:44 +0200 Subject: [PATCH v2 1/6] lavf/tls_mbedtls: handle more error codes for human-readable message Signed-off-by: sfan5 --- libavformat/tls_mbedtls.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavformat/tls_mbedtls.c b/libavformat/tls_mbedtls.c index 1a182e735e..1226e3780b 100644 --- a/libavformat/tls_mbedtls.c +++ b/libavformat/tls_mbedtls.c @@ -138,6 +138,9 @@ static void handle_handshake_error(URLContext *h, int ret) case MBEDTLS_ERR_SSL_HANDSHAKE_FAILURE: av_log(h, AV_LOG_ERROR, "TLS handshake failed.\n"); break; + case MBEDTLS_ERR_SSL_BAD_PROTOCOL_VERSION: + av_log(h, AV_LOG_ERROR, "TLS protocol version mismatch.\n"); + break; #endif case MBEDTLS_ERR_SSL_FATAL_ALERT_MESSAGE: av_log(h, AV_LOG_ERROR, "A fatal alert message was received from the peer, has the peer a correct certificate?\n"); @@ -145,6 +148,9 @@ static void handle_handshake_error(URLContext *h, int ret) case MBEDTLS_ERR_SSL_CA_CHAIN_REQUIRED: av_log(h, AV_LOG_ERROR, "No CA chain is set, but required to operate. Was the CA correctly set?\n"); break; + case MBEDTLS_ERR_SSL_INTERNAL_ERROR: + av_log(h, AV_LOG_ERROR, "Internal error encountered.\n"); + break; case MBEDTLS_ERR_NET_CONN_RESET: av_log(h, AV_LOG_ERROR, "TLS handshake was aborted by peer.\n"); break; -- 2.45.1 From patchwork Wed May 29 11:01:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: sfan5 X-Patchwork-Id: 49339 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:8f0d:0:b0:460:55fa:d5ed with SMTP id i13csp553649vqu; Wed, 29 May 2024 04:05:15 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXrzjo3tEncyVW8NRqH/rWuxK6ULYUekoKFvb54tZduX/oWpcN4oPzQCtqlma8aQzL4vB4sgp7rr1HGkId587wHsZwOgeElh5XBAQ== X-Google-Smtp-Source: AGHT+IG6IrUCfgyV6Gv4p6jhzlxVFGojrFBqH6Rs4WBMyd1l3Zca32TYm3BvjOF6p0e8Vc9i+X/C X-Received: by 2002:a2e:6a02:0:b0:2e5:566:c752 with SMTP id 38308e7fff4ca-2e95b27b11emr121361161fa.48.1716980715440; Wed, 29 May 2024 04:05: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 38308e7fff4ca-2e95bf2b5d6si36663401fa.555.2024.05.29.04.05.14; Wed, 29 May 2024 04:05: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=dRe5nPEr; 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 D4DF168D4AF; Wed, 29 May 2024 14:05:03 +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-he1eur04olkn2033.outbound.protection.outlook.com [40.92.73.33]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 752B668D390 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=TtD4Ak/Zz5JXpQ5kJGYxFAJ+kfpUppTgfWP3rxv49AU0pmi1lWQjg93ILyEd+eeZU1H5A/8nWcU0tQX/cXvksB2q14107AumFPUAmPkLHtgRZHmNrpyUX17/4IyB04O80gxtbubYeYSsg8/KNPyW05L6j81mir9Fln9npX8TxXj9ZIJBt1QLeSkti9j3IzBB+YVRok6aqoqAEPq9fCwFPXSMNuywP3rL6uXSQ0A8i2jMZUE0FL2aozlZLTB+nM+ktcVOtJ1PUZk/XaupQvWFDdc6QyY1YMZAMIvOJK8zY6DSW22QpeYp/56PdHjRD8phuVvSsfzJN1xt+7ujg51REA== 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=/DoW90c7ZoacjLjHN/YCewYajlDxa0M6cE7TUMQkFCg=; b=dZLXzbOyyf95cGu9mgEi46n01Yzo8NNSmFS3xauE9GBtKtaqdoXwTwdE+LVSVFOSYAKa55zKigAHNltDEwH83HI6FAppdob9wWlc+jzGtzKlwAS3nFxr3HyCr+GfD7QlyTWTw9rbBJiuIH387jEDsCmemfMDz2FexN7Rj5cUrsW/Ou5Pz2cAvjydsnGT1GrD/ccl0EbWvFudsOg8tvKDEQPUrzbp7zqBPh55+UNOCAZfvSVpU1TX2QY11g2Px24zQLnIdi4qPUTv6fIHaiy/fdUzh8wFOPOYM+h4TwfvgpM84aHPaC0ZMp1i+MBFPaW9swHP5K+3ibTAaKRzzxZ5Dg== 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=/DoW90c7ZoacjLjHN/YCewYajlDxa0M6cE7TUMQkFCg=; b=dRe5nPEr5PqNJRQS6v8Jq5zhIlbKpKVsDF4A4YEgfeyGv0u73SfgW/YqQAuHCXh4s9aoGgfcre4RhMELCIJDC6XFYobFuGmx6Luqf7rN1hSLXZ4/k+icHu2BowBTA5YYhPJsh75zkZV74pGPAurasdQPOibJBi8uBaWpjpLR7gJPPMyRW2/9gmX3nEVzDiLSzKdflTZgE19TCeMLpiHZ2swPSFeR64I5EBGy93opV2yEkJFp6qSAFu/tr+kM2ckcOvDv3jpbXsDbAGopuvZgUH8jJt+tv/gHSXgY1X27cHeccVO1g85XC6EfwX5siloyPWjZd2HhtfZbUQlqL9cmkQ== 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:01:44 +0200 User-Agent: Mozilla Thunderbird To: FFmpeg development discussions and patches Content-Language: en-US, de-DE From: sfan5 X-TMN: [n52FApaFRlYku4UvNuFv1nrmQngO1jqb2/4vZ7Jno/FHvtUbT0g0PRLUFyKlOEMQmceDxKk0SKM=] 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: <635616da-57d6-449f-a1e5-84cbe6480cb5@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: fcd7bec3-b569-41d3-d0e3-08dc7fcf28d2 X-Microsoft-Antispam: BCL:0; ARA:14566002|6092099003|461199019|440099019|3412199016; X-Microsoft-Antispam-Message-Info: GIb7o8hcS3Oa3UXFE9nCyJNJdcEjPtbrt8cGA2nmNHs4inq6rYSufSbeBkgIn599qwBiSjGjsW1yavtvNG1FWIzKqvKj0ueg70vuXObxDVE43/NJQhG6qN1HGVkXhC38EAtxtcU5HO2tUr5onprYBBj+WjPgEff5MHKut7Vr6a3fOEv74VvsqWvHDRtp8iC8N/JFotfB9lX+ArM5p7hSOnD3PB9SCJhDe85tcAqtR9hwxaJOkh1f24/c0zKsud9SvJJxTilU0SIWZRivwyOnFCvL8X5ssxztIzhlxS1ojgWWpOoZbL/LwiVmiZ0eyD5kNd23qbvGTWr9vBsV7+2XFhaKG8rDKIMHf2a7HK1VXZU= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?UerhyDEwx7HfrlS+trFvtgi0HvyF?= =?utf-8?q?6bSj5PZWEyTGGZe700dyxjIuVIZxr4+KPstBrdCSJerAFDd89rKuhL5aalDtN0rcv?= =?utf-8?q?plXfFl25RSBkYk0WBf/fQle6XO5nLcdnFITmrNhCSVsiPcsFRD1bPZYpyEjKLLFaB?= =?utf-8?q?geNnGu7ja8veRvBN5+yOnzLxDPInEwEYCwqPfn5D67zVhy06sV3TAiG8OwTMtaG7t?= =?utf-8?q?y2UPQBCg/Osqa0v4bEIUvP65C/4OYWD/BNtfJAUhH40H0CQMvyaTmEKSRllsPWWci?= =?utf-8?q?eiXTpf+Bi2vFvfA4fiIzf3g8afDQU2PSKdQz6e9aMQx3mkOv+DiY9mQEUIW497VJJ?= =?utf-8?q?yNTJCze04Uw9YEVxhGDyOa6xGVBInwvom4EKPh3mVu4Stfje8VO/RWWHOHZdCrRwY?= =?utf-8?q?lJUriVAaQqIqr88hXO7CTvsI+3tbgO7AnD2mTSTBMiWsKFoN6ht9mvLQ0TF5olAG0?= =?utf-8?q?ppXczavlTb3blZ3RFFjq/qf+Q7rDPvpX3QkENM0OJWwXmMq2bYZlaQPnuKnTapCTi?= =?utf-8?q?lCUWOFpzpvSExRRWUp/aYJUl5yX1FSMs0bAPz0tKW279fY0R/L2FYuslfY2nM1Q+3?= =?utf-8?q?nfSVZbcfCRst7ymy1YtiiOluvwBLyXrOrQPXpXvSA20v6Qrnds2ekf66ncmr00dUb?= =?utf-8?q?cq1YHe2x+jcYZ5CmLTNnl0taEtC+ZY7/mkzFxsuOb6kct2wixc5IOpOrZy+WvynFV?= =?utf-8?q?p3QVD+86FgJ2jRbERC5V/jj5iWxqHtSF63rNEOpagi8LnE8S6iakng0zmd3KonWcf?= =?utf-8?q?Dzl3mWqaPvgoeW9EkdEiptS7Q/k3Y3mLn20hEVHZ5pJApShLXc0xnsoobtgE73CZU?= =?utf-8?q?OBoe1F3GzvtKMy54zciQmlVq7y2XzpzOLz8lW5AjmXMN+oriOGkYSjb8gETQzYv1w?= =?utf-8?q?7JH+rLhXPobI77F1ob/cTZO3EgqcopMnxIqi+jc/bvkbwKUELEtMg6I0Ab1fahHMd?= =?utf-8?q?je46cFl7Do5Li1xfrSgP6JngdPH03Ox9JJfFXT9b8Y1MYMUX+EK/yKOQQ8BQl4h8S?= =?utf-8?q?0fww0DXn/4WrvLV32k25t0zKVaYhxuRP5ujaSNsAu81YJHsl5v4Fneod1BxhId5s1?= =?utf-8?q?PYtR6FXxrcPQqxr29KfLsrluqzZB3kyGmTVJdkepYd+RhH4BsPTxaspLr/ztawinR?= =?utf-8?q?eeDa+qCiTFDsWG7eDSU1vaXSiZSotDHgp/1Ji8GslsGCUxNycO/+Pr2neKeSA1Tt+?= =?utf-8?q?JL52Ey3OJhHU8+VNWjFsdmaah08stkIDyQZGNR7utMNdc0ZhYOGGbJMj5GGw=3D?= X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-76d7b.templateTenant X-MS-Exchange-CrossTenant-Network-Message-Id: fcd7bec3-b569-41d3-d0e3-08dc7fcf28d2 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.3387 (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 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: 6hNTH89baw2/ From 18142d98aed9e48a78a37590341bf48f1fe2339e Mon Sep 17 00:00:00 2001 From: sfan5 Date: Mon, 13 May 2024 20:24:43 +0200 Subject: [PATCH v2 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 1226e3780b..1a61fc57d6 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, 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.1 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 From patchwork Wed May 29 11:02:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: sfan5 X-Patchwork-Id: 49341 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:8f0d:0:b0:460:55fa:d5ed with SMTP id i13csp553868vqu; Wed, 29 May 2024 04:05:34 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU8iJyTPT40G7BET9mX/Tk/LDIVE5CHfMMAvkUN1HxUYYzjbcprAfo226HMSbEOKIN5vPqB5FAfJPQeBs4FIydjPGqmCqTGYYhHrQ== X-Google-Smtp-Source: AGHT+IGEGDgEX/9EC7OySwCzaD3F0gV7UoQOZUUnX8wWv4iL4ZXahnl38sUr4POjfAgsFytMKTbf X-Received: by 2002:a17:906:a294:b0:a5c:dad0:c464 with SMTP id a640c23a62f3a-a642d267093mr158290366b.6.1716980734284; Wed, 29 May 2024 04:05:34 -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-a6349a659b2si173626766b.839.2024.05.29.04.05.33; Wed, 29 May 2024 04:05:34 -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=oc5hDg90; 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 572C468C371; Wed, 29 May 2024 14:05:09 +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-he1eur04olkn2033.outbound.protection.outlook.com [40.92.73.33]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AFEC268D4E9 for ; Wed, 29 May 2024 14:05:01 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=k1tkqEp6owKWceOS4vQdiRPt9blhcAhhCZK2pzcLR/nfWUmWzex5O6tsIu/inhEUUw1tU8qoFbHA0j6LHIxIWn9PdidTkqHOthXZkzcTky/x4Ao3/ekHdGzDVWrb7FvYPzf8r6WqqjwxSZtGCaVLl+DKH5QEjXXURbWf4w8mogJyaSHoggYwdYnR6SRRDykgFIeXwHF0unIV0zKXTM8FW5pFC20f7IALp6xm0ZFrnSPdSBf11oS0FT+vfzuhDbk8xvHWArVBvUG0EZH6IGlFs8UZp63MkoEcL+zFztw+unUM15psiSRestngIzboadtBaMGO7EoMG8kwpLeS+fm1kQ== 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=UWvKkdLq6yMc6YXPKdntjAFlkMZGEieIUOx8LnBQegE=; b=XNSip4iN6uNLr75mMOT790+W7Ab8x8RUmKgRKBwug0hInu4VacJj8nliU9UetSR6vLcENleuwITK08/k+a5ym3Hj4bnFogMD4FZ5B3aYzA/XPHKOpY7/yWaYxHGxpbSDwtZLAGZIEKT4uIgkmQR1r1fWgkTdDH2PKyTU1jnHG5X5Ai7wDFrJgGXYetbevXh+CPxOn7BJXcrC2VH5mRQBTq1bz1Ky/69k1JT2SAOtrs1fF0re/MBIfYhFvW9SRgJqwU8sVTJIsBZKt2o9CjiADbCgujfAU1nU4NBUu1RpcEIL8q0TN0dqrgZ7SrYfe9/U2lrK+r3RChVhM3miHvCsXg== 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=UWvKkdLq6yMc6YXPKdntjAFlkMZGEieIUOx8LnBQegE=; b=oc5hDg902GkP130NHcHgBVMBD0R3smunbdHs1sCny3mPh25UtWhvY9vuQi4+8HhU2mquWMFXtoun1MzI3bzpFPnMpkj1rkMF2J0Q7DDWEF9dsSIMvkdv2F83bLNjE03aKTDkVHFGpXXdkqNoKVlVEBDQdYdgT9rH1+Av6vr65CeycQ1Z6QSmzSfc7Yth5enNjm2zml6tjjtETgT8OLNyYyaCcS+K/x5U1HdywbtN/CgBs6AY638lc8lDCTJnSch11o2xXc+f/+rwoSDclB3MIBDXAFHGYFyRc2opTQeRK/dxzsFzz3PZp5pBCS+6hlWlElZLpMj+eBFdsf4mdiqBvw== 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:51 +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:51 +0000 Message-ID: Date: Wed, 29 May 2024 13:02:42 +0200 User-Agent: Mozilla Thunderbird To: FFmpeg development discussions and patches Content-Language: en-US, de-DE From: sfan5 X-TMN: [05Wwg0wON0BC3OH19p8AjUOVF6GbwJm+pf14D2Z3H7ec+uSy8HDL8M1S0t094K9YO22cmRuWPYQ=] 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: <579cf275-564f-45f3-a49b-12aef42e8261@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: 24ac4548-c219-4f58-f904-08dc7fcf2983 X-Microsoft-Antispam: BCL:0; ARA:14566002|6092099003|461199019|440099019|3412199016; X-Microsoft-Antispam-Message-Info: KLSciMgzyzDOoInBRCEG4amyO+uxllVyJQdeWQKI4xmq32euUtIxF1h8I+B+Am/fAu7GV/DzP5I7TmEGoawd9YoCYITPS72kKy5E/E9qExUtrr/FuQNv3Bcg1pczgRs9Sn4pu/nIzBdEIRbcPBpZoYnG+zvtWnhnEzTDR1c2BEaZV3aqzT52eruV620B7T1a0dm4aY6yEcBgxn4jDPf40+BdAGElwzzJHoHz/Bt+Ti4cf7YyB8Ou9vJ1DiDBWnd2YPWhOeMIH0IYg5IazeXuz8i/3Z2uw0+zj8F2fVr8xmwWJqtI7xuR9TBxkLw2FNgjnCoVh8mg2i+eNhWqmUIv8vkW4h4NvjwuAY9RDhqVssU= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?jicYMmh2tfKdQfQk9X8zwCpTg7io?= =?utf-8?q?ADpt1g++C62QqE6GCeoW3O+Vjw5Nq9YWX6GPPAWTevVlZpnnnwBkwlffKrSq2b3Qg?= =?utf-8?q?hzzcfeRjcbr4OFlonzxwzyqLd6LODOivCTzpdS5bdozhYb7QawVS5CsBvVg3pe6PS?= =?utf-8?q?G6/Eq0O1m7C7k1bG4hJtqzfXWv4xnpWk9ufLUG/Fb1W8zzhY6Q/ufQiULTCQgoNtV?= =?utf-8?q?e02ywe+4T+4RqwCbZ46xFcgsHmFgMitn8s7ACKLl8Q0cYtrr2ixfKEBSOnJ09xlAe?= =?utf-8?q?PtxHNlte+YsLBgKY+Q4iZ2wwTwLSvy8brjMblopJCZklQxVDg5Lp7Gak65ZTKm2gT?= =?utf-8?q?pDOnq1shd0WMYGZDucSN7wpoW+9edE8xKbMV2QN0PVvH1j1AK1RRQNTR/L0ekI+l3?= =?utf-8?q?DUsd4BAKGx7pPwUjBIZKtaSTs579hoAT0lWf+0KNfWVJdQMNHH+Dxf42wrOPGoEsM?= =?utf-8?q?/x+Pilk3YOBiaeBsMxOQVicJBeXhMjfmCxC+ZhenUoSlgzTspEL7D0VkMh9bcfBC0?= =?utf-8?q?x8TOUTzXMwXYQdrPezRpAvkaVqtAoLpu1nNEo+xIWcNU+kgX4ImPAnD22uzLdMVRJ?= =?utf-8?q?hChQ1373ScDjLcyb3+pDHt0R0LpySsQKgRWLcJItATgnnMkRMksgHeEroCXciSa6/?= =?utf-8?q?7aXh1csL+Z2W3BSvxPE/3qFy0GwJ3kTYrAjS9SbJBjP+TbJRIr82fQfBi/4HafNrl?= =?utf-8?q?OYcv8erFWmdi/LvhjMqxYOxKgO3JeGLKPc+6KephaitQwRNN5d+DAcpouaBqLPJX3?= =?utf-8?q?bZdkU8yPdv7K3UwuyrOUUbpGPKGtgZCyWUCPRPD4dv3btrmsOEm1tjZQrpcJW4rf4?= =?utf-8?q?51gWhXkCnqMuIuYyK8tJ6PQmDqKxarBQzthLAEZZwbRPg9Z7awspLD+pWVSogb+8m?= =?utf-8?q?9kwfetAijDDF5Qv1Pau+wHP6mLec4/JK4C7F5NKzdond0RF4GHiIUDd6yPMT11lF4?= =?utf-8?q?htsuDXoDL0dmKk4IVveQb8elVxAlMYtNh3pfgTebhJ/Zr6D4sjwzzKg51WXxlyY8o?= =?utf-8?q?mVsTIwSWm0+mOHGbmb2K81dQv4ko0257w+DfZM6YUBdXLR2kKSPiW3xRp+n3K6Ltu?= =?utf-8?q?zl9NQV1i99dtbfwGkPA4XhNaT/3GMaBmrlNzylRlnANuUGLBR54u8OjyL4FMh461a?= =?utf-8?q?PCTubEvNDmbOB2ihTi+gM7bsc2rGawaVb2Twpkdf+ew97BQX9kSEhGMBAlkOdS+tA?= =?utf-8?q?DXjKrgD/PwC5VDVNUc95F9X0NnQ8ma1DOs5AyVSWI67CF4nETRcx40RjHNgY=3D?= X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-76d7b.templateTenant X-MS-Exchange-CrossTenant-Network-Message-Id: 24ac4548-c219-4f58-f904-08dc7fcf2983 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:51.3416 (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 4/6] lavf/tls_mbedtls: fix handling of certification 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: fk04k2Ke/CLA From d561732d7c05d820baeb9c8bff5e8a4b133fe624 Mon Sep 17 00:00:00 2001 From: sfan5 Date: Mon, 13 May 2024 20:27:17 +0200 Subject: [PATCH v2 4/6] lavf/tls_mbedtls: fix handling of certification validation failures We manually check the verification status after the handshake has completed using mbedtls_ssl_get_verify_result(). However with VERIFY_REQUIRED mbedtls_ssl_handshake() already returns an error, so this code is never reached. Fix that by using VERIFY_OPTIONAL, which performs the verification but does not abort the handshake. Signed-off-by: sfan5 --- libavformat/tls_mbedtls.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/tls_mbedtls.c b/libavformat/tls_mbedtls.c index f53e918e04..ef447e12a5 100644 --- a/libavformat/tls_mbedtls.c +++ b/libavformat/tls_mbedtls.c @@ -266,8 +266,9 @@ static int tls_open(URLContext *h, const char *uri, int flags, AVDictionary **op goto fail; } + // not VERIFY_REQUIRED because we manually check after handshake mbedtls_ssl_conf_authmode(&tls_ctx->ssl_config, - shr->verify ? MBEDTLS_SSL_VERIFY_REQUIRED : MBEDTLS_SSL_VERIFY_NONE); + shr->verify ? MBEDTLS_SSL_VERIFY_OPTIONAL : MBEDTLS_SSL_VERIFY_NONE); mbedtls_ssl_conf_rng(&tls_ctx->ssl_config, mbedtls_ctr_drbg_random, &tls_ctx->ctr_drbg_context); mbedtls_ssl_conf_ca_chain(&tls_ctx->ssl_config, &tls_ctx->ca_cert, NULL); -- 2.45.1 From patchwork Wed May 29 11:03:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: sfan5 X-Patchwork-Id: 49342 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:8f0d:0:b0:460:55fa:d5ed with SMTP id i13csp554009vqu; Wed, 29 May 2024 04:05:45 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVgpMApomHveymmFMZXh6dGRG2c0DCZrcdu3vWdAJ4SzApQTz8kpfqiwwvQpTKq3XQnlPxbL+fkTJUq4Y6zPuahP4p3mQ7zzy/RIw== X-Google-Smtp-Source: AGHT+IEItCMGgJKzPRhjD18WEUfyUp982bJAhLj31WHNseDdnNMCu80pmCcLKXcq5r4S5oHpNc7X X-Received: by 2002:a17:906:71c7:b0:a63:4df1:4278 with SMTP id a640c23a62f3a-a634df14400mr408883766b.4.1716980744754; Wed, 29 May 2024 04:05:44 -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-a6356b85952si139307266b.845.2024.05.29.04.05.44; Wed, 29 May 2024 04:05:44 -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=nE5BJ4Ga; 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 4C76568D535; Wed, 29 May 2024 14:05:11 +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 09A1068D4E9 for ; Wed, 29 May 2024 14:05:02 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=drBCpwbofJoa2YullRlx/GPxxWoxTcOgeDOsALalHWS8zTtEVGjgQ2RHLrbrV/t8vsC2jpYS08tPShYwTJuZ5JWw1521GelAy2sfg1KigFfTP4JQ3BNBjdLW72Uq19OQp5oicrw3KHmFSCe7sWMrea/3YduubL6vfbBorl8P/0qn84SpNNLoDFn8DDrcKGayxKjRdmy/Wc6MRpgD55BhpIgivTMLqNrQY5KOMxLo4oyaaUmn0c6ASfUQvxT/VntlS9naPLdR4Z1x9cd+mXWDjCy7rxRjk7s5syHmBk0cvsmfq13jNlH2fuCaBcjZMcM2wxTYcp4AO4R8BIHZgI7t8w== 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=nrC0cfzr1VEy8VbKoYCu9NWrBIGbj4NoehXow+vMGPk=; b=bXs7EgCvlKuHjbuLOuVUd/838p8n7SdDW859iU02f5l03EAzukWixGOo+pPH38cj14MtuRxXU5O4CvGh7+V9JvHZzYPadpo0AIJ5/pSEelEeo/mg9DGeIwYqUQ5SjZ4eUsMJdg0wwau4RlAArvdbcl8aYR9902aX0yLSmYZx+vwGbg2+TajJ21iCRC8IXo2V8XFQqeuMA9/qBwMt0Ugji5CrDSPD6UZB6hcrwmwgCxS61o+kmfHm4x5xYSO1q+2DgadBUEXURp2nog8RdvNzHhCHTEuoNufSxuC5MjafTbykWNEnz+CvzPBeR9G6fWwkNKkl26XPBgl9lIG2x1cNgw== 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=nrC0cfzr1VEy8VbKoYCu9NWrBIGbj4NoehXow+vMGPk=; b=nE5BJ4Ga8fCYejrkRcv7eRVoNl03YFHt1Z99Aouq6SOaeqPaIgqNhAQYRS4rocwEEQvzmUXPUCmrfTmKGyh7daWnURYxewrWa0k6IuX6rlrRKQDeJaQzBqwpU9Z7A79ZxyYGe6rL7ZtbG1cgdOg1+b8ct6q9pIy1ohkaCBrDnqh+g+hiqdbfLJWlgudb4gxsWadP1LIKB1pb5XiH64mb3MEylb2FEES6EDcp5nQgOCJviNDx8xlbvqO9OgqEOQYyJeXYA0XRJdZKF0JpZvuOwd+pe7iVz5cNpZZtEPGPzuX2IwOZO/Zyo2THT7N0G85T7hGwoGtPHjIKkRnIibWEdA== 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:51 +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:51 +0000 Message-ID: Date: Wed, 29 May 2024 13:03:04 +0200 User-Agent: Mozilla Thunderbird To: FFmpeg development discussions and patches Content-Language: en-US, de-DE From: sfan5 X-TMN: [WURRzNOXVi7s/4fkvdnCC9MTfNW1vQA/Btk0k5CTEyTaLHyofYV5SaZ9u8SwIw6RPumsZY1fFxc=] 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: 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: e0a30ded-688e-4f5e-942d-08dc7fcf29d1 X-Microsoft-Antispam: BCL:0; ARA:14566002|6092099003|461199019|440099019|3412199016; X-Microsoft-Antispam-Message-Info: TC3CZg03GgnQ5q2tT+E9xQ17lgYc7z6a3J8sYW0jzDFCW2xZfJdbVFTDMYMKjQJ79nG9GZXpqAz9uhYocTH2Fsm5bWJdyDbZu9MG19NL99yFUlKsG+/r3ff+4XNgkao55BAOMk2OFaEcGeCJxWeRaZoOSrym06uYKEHqykGPwKi/p6gh2BZuHpbCMd44kO+ihBRVBZW/TW66j26yds/jarXxSGfk6SKNSSSQ3vTslTG23a3VRA9W6dIW/cinQZunQggnhTfqSikuQj1Etqe4tvw20J19swwxltsJDFQq+sQlRbVQZ0RkSxYVNi+RSv00hW/1G6XurQ2k0jFOBcuXMpDdLQEIMGurpqxX8ZoupWE= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?KavIAIStDvdBnI/XX71YaUtH7Yb+?= =?utf-8?q?z8gb+w03l8GXpQ37HpfK6/ev6c4x9S0CNcyQI7zFCaSaD63w0TDDJ8kbl8y1UJj+A?= =?utf-8?q?oVE7kvkjRKC80J3cDmaI1sToYslrjD9BPYXUIzpX6b45y5N0AxBy+PXMWuFX9N0zU?= =?utf-8?q?+OFZIbwHtu9b3JNg35jUt7AB0PnpAiTCUoXtLTNhQ0W9finYyoJQql52g7GDig35b?= =?utf-8?q?07483ln+bpbMarQu+vYb+lyg4BDg0Jk+1zRkNWYC8JbCh7pDBoeogJ4QV1QqvRmhL?= =?utf-8?q?gKs9fr5iFSi33C07pPfWGOXRnGrPC2sfw6tbQz4HXky7N8oVKc33pL1WFPDbOGu7H?= =?utf-8?q?f12Lggh13GfslHZbvPXPhF38kUc7tc1uCrghgockYWrwP0YhwQY6U2vaSqbsb+sGh?= =?utf-8?q?SczOFdd6tz59HbN4ZXsAdPAoqDwVA23lX5axQsT9PL2AMnnxr9qpaDuZ5zSj3lLBo?= =?utf-8?q?OgiV0nhgdtRSrVkemNMrJhfHEGX1EGhWYhNCNCgjc5XElniifk5HuFloC4Xhjm15Q?= =?utf-8?q?2iRlD1qCu234YUUfw9YFa+Dm+yIhtwNFOqQebNxx4A/ySUMEv9K82RK5xtJBpvwHg?= =?utf-8?q?xjGZk7R3H2A9ALveEaVFzEv3+mmug1+K2plJiqPoTSdfngt1KzYzaAM3rpK4d22bi?= =?utf-8?q?DKh3zBm+3R32QUKpFr2G5i77NEcFVdtxJK1+0tvdw4j47NdZr0PCeejQJ+xSLMy9j?= =?utf-8?q?hTgSzklHlEcam5y5BMh5ECXzNabjlerVMiYuHijg/miUiQ61DcmmjjLaH0+rCdji3?= =?utf-8?q?Vv01MieYyyZboVrrOyPDgyLg2U1S8YivIF89WgPQx24oj/8UaBH2lUrrzJNOvYJZp?= =?utf-8?q?lml3upznSknZJzxmiUirPKsBTIVF9B4LKt3N0chEdVR4SuJmLD+yjHQzNNzducUgK?= =?utf-8?q?AhPNmuGn6s4bsIyR3YKsmkbWDoANrJUmUIfw2ouxjox9Nh4DPbq+HP7TUVJrZ4DhR?= =?utf-8?q?8ZhmPHimf/LDTLC9ga9/1blhJCcJtzPS+Tsrd9QfAJVpyR0MOvIYCX1wcIAK9INyF?= =?utf-8?q?7mOCU9IirKqcCnc/9RwBywAMIwoPk/8TgI7PXBdepo0km7iFxYVvd9v6uLLe/VO/b?= =?utf-8?q?DxhXcRHIT5A0jvBsfXIxqLYdi6ih/1IP9L55F8qKgZ+rxUUqTN9M044Dd84+TDBnl?= =?utf-8?q?VKzbSRw8fJ7vsJTBUVrLtQqez7Z0iNJB/WGU9eD0Llaefzf0KA1q5a1bg0b98Sd/m?= =?utf-8?q?9OJdSjYjWpWAniNy7BnS18UL5n31PourHE65rhoEWBcAiiWaENtDc7KwMl6s=3D?= X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-76d7b.templateTenant X-MS-Exchange-CrossTenant-Network-Message-Id: e0a30ded-688e-4f5e-942d-08dc7fcf29d1 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:51.8194 (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 5/6] lavf/tls_mbedtls: handle session ticket error code as 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: iK/1ZfaG5a/X From 87bf4c7de225036b5e4458c9de2de4b941f8f9b6 Mon Sep 17 00:00:00 2001 From: sfan5 Date: Mon, 13 May 2024 20:29:10 +0200 Subject: [PATCH v2 5/6] lavf/tls_mbedtls: handle session ticket error code as no-op When TLSv1.3 and session tickets are enabled mbedtls_ssl_read() will return an error code to inform about a received session ticket. This can simply be handled like EAGAIN instead of errornously aborting the connection. ref: https://github.com/Mbed-TLS/mbedtls/issues/8749 Signed-off-by: sfan5 --- libavformat/tls_mbedtls.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavformat/tls_mbedtls.c b/libavformat/tls_mbedtls.c index ef447e12a5..9be817af5e 100644 --- a/libavformat/tls_mbedtls.c +++ b/libavformat/tls_mbedtls.c @@ -325,6 +325,9 @@ static int handle_tls_error(URLContext *h, const char* func_name, int ret) switch (ret) { case MBEDTLS_ERR_SSL_WANT_READ: case MBEDTLS_ERR_SSL_WANT_WRITE: +#ifdef MBEDTLS_ERR_SSL_RECEIVED_NEW_SESSION_TICKET + case MBEDTLS_ERR_SSL_RECEIVED_NEW_SESSION_TICKET: +#endif return AVERROR(EAGAIN); case MBEDTLS_ERR_NET_SEND_FAILED: case MBEDTLS_ERR_NET_RECV_FAILED: -- 2.45.1 From patchwork Wed May 29 11:03:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: sfan5 X-Patchwork-Id: 49343 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:8f0d:0:b0:460:55fa:d5ed with SMTP id i13csp554128vqu; Wed, 29 May 2024 04:05:55 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXALo2HY3mvWogarYNsUdzJyTIZc7tCCENCTrFfDpf+1U92HZaVAFtrU2hP4NFM3/xV2PLTkS8dRJaDXq+px9nOhrsoC4Q4CWsD0A== X-Google-Smtp-Source: AGHT+IGCeypajRHorgEATzYmau0YT+K0VeA8MNoAqLDpBMr24e/jAwslDQwbCvZtOQq9dBRODsuz X-Received: by 2002:a17:906:ae96:b0:a65:19c7:70d9 with SMTP id a640c23a62f3a-a6519c77159mr72361366b.7.1716980755323; Wed, 29 May 2024 04:05:55 -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-a626cdd47afsi597498666b.1026.2024.05.29.04.05.54; Wed, 29 May 2024 04:05:55 -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=nqJJZZi9; 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 9373768D53F; Wed, 29 May 2024 14:05:13 +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-he1eur04olkn2033.outbound.protection.outlook.com [40.92.73.33]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DF94068D4E9 for ; Wed, 29 May 2024 14:05:06 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=T2izFBjajyAEfzh4c3TNhb9VSsXP8FjFbR2dOdDFVbaLLS5rtusRmow6EfdXonzz9cdrvrjK7YyVDjM3ky3KLaY5FmcqpqOtN9CH6GaHmW32VYakoaiMUkBf8OreqnY+yJqLajvzNXSSDBpc0f4CTV4xAdaKsqLksRcPmoqthFxdvrYUYDug2Q1C7XcrmEVKPZ4lmpdfR+HO9MdJYHR00M6kCpzWWIFGwhZQ3lcoL+X30+Ms/B99mRHIJAwfoNwFd9V6AVWV2AsfXv5mAyjdf7pihxpORYScQ6JehtWe26UHO7VIRKv9rxahxVAdnW8j/Ba+4jKTM+0Rk2d0hQAoOg== 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=jT6HJpa8bBmMm8mW1hpJUV8cSmQlc4ENZj4XQ4Zbvl4=; b=lXSTO9oZ0WSEAOan8kXUBivRJ37y1fk2Tt6U2MA3oT9dat/4cfwNI1aav+2fNi5ylqr8KSjGRKWIVWGcoTfBLx2qkgBU4zY8cwLpzYNo/YNI7yrpdewnCeNONFqkl28wA9R6R/m/DwkYG2lqzsLL/YwcRTkcb/8SVRSKQ9uV0S/uRku+10FLQbWQ2CTSRlE/e6V8L8x7B2nweqMFAyERkSBWwYWR8Zg78bjrO6Mde+6gCsp/kZLCljx/ap6oWhbfVTP/F8/lw1QuzAxT2ztaS3QUqdeQCGZxWRj6EBXpwzbQU4M4tOIWH9sq+q1MmRPuw8ohE6QZrH0siknxx4AI4Q== 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=jT6HJpa8bBmMm8mW1hpJUV8cSmQlc4ENZj4XQ4Zbvl4=; b=nqJJZZi92PN4+d6USac99iC6eNd/MOtBOgp1BdrnAC5wWY2NnOzbFJsI3E9akwm3oaD0T+kTQOfmDXjup0KboBWLV2pA0R5rh8F6RdcO+MaxwAJvuLXoZJyzBf2Io4LxtmmYcMO8Zhb0eUQwwt/2l0EfOlPad4C1TLExsHFKpdBXQI/4SImBfedYR0ZXBZ6N6H6C18C3MvTkRl6C7X3CqYSnCFO7nLRxHVVo5olZ057SY8QBH4k6JPfX/HwDgtX+RS+HQEsIMdtzYdSIAVMNwRd+9UMJpa5S/C+hUGxRMhtDydk44HL2ayG+ujDY3VsXEMWmrSj+Je2N1lLCY8+swQ== 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:52 +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:52 +0000 Message-ID: Date: Wed, 29 May 2024 13:03:21 +0200 User-Agent: Mozilla Thunderbird To: FFmpeg development discussions and patches Content-Language: en-US, de-DE From: sfan5 X-TMN: [rXDTxnCM6D5ZP95TbaGvxgONlvawHBRGAN2ovrsJtDTGBMoOYaPEDkTbNXW8reJuKytJilPNGVM=] 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: <8244ea3d-63f4-47a4-aef4-e3a58e8bb243@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: bf153f8b-b653-4995-c39e-08dc7fcf2a41 X-Microsoft-Antispam: BCL:0; ARA:14566002|6092099003|461199019|440099019|3412199016; X-Microsoft-Antispam-Message-Info: K/7DOLwqTo0UkLZ9MAb2wHDvFEhaVrGAzevnebCT/EEn/yT/UZhVMWiAlY0YE9CmS5+EJPTT5hQS5ESp/CW5nW5dredRfxR/WO6bpVIV8ADS57Un1mj3hAkMDMPZhdOXUnIyaVv6W0J/TOvpuD2b/naLnwP6shH1pF0B0OJ3i2w5450fnObj5g/ByL5hezwq/SGurkfCKiRHL+MlbGdQ7QN0NdosZeE5LafIkvMPX4d8mTJeUzY62kj6+ZOjOhxRcJqBjStrD4+TkZ/Wx5JdSM2xu1cd750kNr3teMCK0Hw/WMh87Ckto996tcOPjBtjpjY3W3Bz0XdryP0yAJiyWPZnVAlBX4Ilghn7TtIGVsE= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?aUhPNIKzY9+7XzcQ+FrhHjndJx1q?= =?utf-8?q?VXtC8gjexhZ/qUumEUifqINl7MC7U+NrW5ghrwlbNk59ptaC8QBkwKcb+QRcTNrCb?= =?utf-8?q?d/AaTTsjynWXsAVljt7APs7KmceNGR6wafJh/b58b1HgFK8G4ygPKCNGIottnJ57l?= =?utf-8?q?S0YGNOvHL2I5RXODOD+mKNi5ERwVaJm7OLg0PuBIRwANE7Y5IPphCCEMe1mzyRYdT?= =?utf-8?q?oKbCsJbK0r/PwH3jDYQiOMxpF7JAiEST8dzmCddI4MxCJAPCZOBpvp6gnflwj5neO?= =?utf-8?q?2GJmxaubMUXFcdI6KFVvilWznsY6c4Vi09Q6Mo5TEC48DaUfS3rRaoD7bWgqS8E9e?= =?utf-8?q?uATNCv3kKt5Vktb9L92XPkwAua35c8fd8eLOIfj2V2RrczbzUseV2ZNJnxBIgDssC?= =?utf-8?q?TdveHK0QoJSlynarHaOsp9uqrF9c1ErPQR9UJLUxsdrERkUF8ZS3t2DsESr8LxeZ+?= =?utf-8?q?VJJAMVD7HlbokwE4648MHREjhTxlHQtm4suRTVxvWvB4gxQUNDCADUN3Kc8f3UNrq?= =?utf-8?q?cB6GffK+NmSMHNaoVd0xG6B6P44Wcn1NSowotT+wHy6kRe5XxrEMuRVoV4uGGPOs5?= =?utf-8?q?24fRG7NBxR0Ttc7NtsvHt74RzpAAiNPUItMVEWxIlv5Gl0KwN2Utj7FWYzpslvWLF?= =?utf-8?q?J8vq9vahlyz6WbhilulbpenFjjNwWMp7ngUOHiPs8cC9AH43pQiHWEBJjJtdExROm?= =?utf-8?q?wov8a/3t9ip4zulZq0mOO+0aql2aPHKbUO4CzOMYaT9ta9BFq6B94QkWS6OGKToqJ?= =?utf-8?q?YAzBZzCkf21KGObIV1xp1kFzhE3pHpk2sD9a2PBjZ5Rzo+pgWldA/0i2m7zhEyCnm?= =?utf-8?q?+5swxicABXC2RUtisFAcFS13/ZJq2hKx4RepTrdkBMQ4eHjUZUfw+vSK8Wd2nL1R2?= =?utf-8?q?fxuvo+iI6VENDKpuuaUbivDTXD8UeVkpFxyS3ET7D+0Evi1+nz6sy8JCb2ZUDsXaz?= =?utf-8?q?GyaQ/sKzFw7kBRBsT/tNiVR6TAm3KTwVm4E3gjfplE+pdhXAfIHGf7k0aKqtnJxkR?= =?utf-8?q?gRvYmyzP03x7EVDUu0GdZ4cZl17YBPsoy+KqmC96Cde3beYtuhUqBSw3waXLoQ9ga?= =?utf-8?q?F2V6um+KS+waU1Eqy2NEJ9jUO4osO13McDztUqkMR5nXgpPdH6NALikbhXlry8nPZ?= =?utf-8?q?PyhxyitGC3ylYsRLWTfgOGcNsaWfP5DZpeVBNaurvJyld5Dbc2GsxclfMV4tP5pKl?= =?utf-8?q?rm1TuiMKCoThZ7wY7rKgCsMvF2YshJff3yIJJjEzDG/xv5YzVrjuLq004zPE=3D?= X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-76d7b.templateTenant X-MS-Exchange-CrossTenant-Network-Message-Id: bf153f8b-b653-4995-c39e-08dc7fcf2a41 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:52.5865 (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 6/6] lavf/tls_mbedtls: add workaround for TLSv1.3 vs. 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: 7O6IfY4SaxaG From 98dd9aac129fbdf07f83da16b7307cb775ff8e66 Mon Sep 17 00:00:00 2001 From: sfan5 Date: Fri, 17 May 2024 10:06:42 +0200 Subject: [PATCH v2 6/6] lavf/tls_mbedtls: add workaround for TLSv1.3 vs. verify=0 As of mbedTLS 3.6.0 TLSv1.3 is enabled by default and certificate verification is now mandatory. Our default configuration does not do verification, so downgrade to 1.2 in these situations to avoid breaking it. ref: https://github.com/Mbed-TLS/mbedtls/issues/7075 Signed-off-by: sfan5 --- libavformat/tls_mbedtls.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/libavformat/tls_mbedtls.c b/libavformat/tls_mbedtls.c index 9be817af5e..fbad23ab8c 100644 --- a/libavformat/tls_mbedtls.c +++ b/libavformat/tls_mbedtls.c @@ -163,6 +163,10 @@ static void handle_handshake_error(URLContext *h, int ret) case MBEDTLS_ERR_SSL_INTERNAL_ERROR: av_log(h, AV_LOG_ERROR, "Internal error encountered.\n"); break; + case MBEDTLS_ERR_X509_CERT_VERIFY_FAILED: + // This error only happens with TLSv1.3, we normally use mbedtls_ssl_get_verify_result(). + av_log(h, AV_LOG_ERROR, "Certificate verification failed.\n"); + break; case MBEDTLS_ERR_NET_CONN_RESET: av_log(h, AV_LOG_ERROR, "TLS handshake was aborted by peer.\n"); break; @@ -266,6 +270,14 @@ static int tls_open(URLContext *h, const char *uri, int flags, AVDictionary **op goto fail; } +#ifdef MBEDTLS_SSL_PROTO_TLS1_3 + // mbedTLS does not allow disabling certificate verification with TLSv1.3 (yes, really). + if (!shr->verify) { + av_log(h, AV_LOG_INFO, "Forcing TLSv1.2 because certificate verification is disabled\n"); + mbedtls_ssl_conf_max_tls_version(&tls_ctx->ssl_config, MBEDTLS_SSL_VERSION_TLS1_2); + } +#endif + // not VERIFY_REQUIRED because we manually check after handshake mbedtls_ssl_conf_authmode(&tls_ctx->ssl_config, shr->verify ? MBEDTLS_SSL_VERIFY_OPTIONAL : MBEDTLS_SSL_VERIFY_NONE); -- 2.45.1