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