From patchwork Fri May 17 08:34:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: sfan5 X-Patchwork-Id: 48947 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:3a48:b0:1af:fc2d:ff5a with SMTP id zu8csp2736014pzb; Fri, 17 May 2024 01:36:43 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWF9lx3CZ1daxnQv5Q8uB2ytXlUohY+yYj3vMyr1rFxqdzirYp6OEDuLdXEIfMYxhPdqy4R4euzg/+uI/Q7e0gH7Wj0GyVdNj0vLA== X-Google-Smtp-Source: AGHT+IGHllMd7Qf2b46+GqMcb5NOCIxyfliAghUn1gN/nUyKksHcGdgXEqxMmDYBIa1BkwR34W9A X-Received: by 2002:a50:871c:0:b0:574:eb43:3864 with SMTP id 4fb4d7f45d1cf-574eb433912mr6223655a12.4.1715935003624; Fri, 17 May 2024 01:36:43 -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-574ecaba0fdsi3386335a12.309.2024.05.17.01.36.43; Fri, 17 May 2024 01:36:43 -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=HzwMEGbM; 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 B3FF668CA9C; Fri, 17 May 2024 11:36:21 +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 358A868CA9C for ; Fri, 17 May 2024 11:36:15 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eiW9OZU6S9C9tOvFhVS1LDYGKEfh3ern2nRk6QmjEE/DFl+iS3Vli0doyVRv6tdZRx5Xd1j0dPlg68Z9Zri3LRtXOlvVtjpwR9u4zTY+udZhvHFGAB4HVXFOt3Zdxu33SVipqN5yoPVjzujEMt1NwXYhnDq0qck8lcIRf0Sld78DW7TmYAp3G9c0h1VJdQjuOst7MvONNrEZ9UzG9pm58e08kONSA1XbbzVUpykFFHo2MJABOO/tw8HtaFCwSX+v+xFRMaoObL/vukX2VsfeNXhyBax7o+NAtPytsSBrzmiPkNC/lzOTiPVIoWQThUsR1YE8BV5KP95ZP0Dpjn0jwQ== 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=qA5ryjWvsJwTYdEGhIgl5e9BC/sSKoHrYUXIrGHo8o0=; b=lTnWZ2AxKk7Awfuutx6rM91+SO+c10kNvEDHRLaaHtvBaimEPALnQHUYl8PWrtGfS7bmytrDJhspzGUzpbGs2bdNg8LeBAeTzg6tYJTry5/vQdiMv6SI7X1BGkqi7K3waTO6+8cqYLVFwTUzSnpurYVt0hVx127NYe7aBYheIojLm7V0/r25m/XDpFeY23jsaF2cL0gm93F/+5hYEo9hD6//EAMvK0kuqZjC4oVZmdOxzel2VsJ5U1PCjshNs8yB0PtHTD/6m1GkBCu8DWPHwcUpbOxMxdkTneYx4Q8uWsonSTnGofLCQoduYdgC2JVUj09UVC1RJxbyUyR9kkbZUQ== 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=qA5ryjWvsJwTYdEGhIgl5e9BC/sSKoHrYUXIrGHo8o0=; b=HzwMEGbMDRxgNxRGQsCBBJAny1PO+tu7g2m9YO9Wd1817l96tFGnEIQkd+H5PdxhZWTx2AJplEBMDFXThD2zkAuCYQcKm0DQhk/cC3ZObWf2tlVPp5G8KKefgy6HHfdDPIaCoqUK849a7LviJ1rtSqvJi4OC3f8Jy8NQWbbpYdZc1tJ4Od3JeO7zIdCXRjEJsttn5GjOMml3DHKf9fMsk7YJY7YF3BMfqvsFeXeYl9E5ea6dndRFZIQyY1GbDEJw8d6LXtT61xG8lNbDZUhrJath1BUkuBXqxihfPObnRZ3yPZj0QnNh/mE08l/0u0KJGFvgvJjQxKhOTYTx2jx45Q== 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:55 +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:55 +0000 Message-ID: Date: Fri, 17 May 2024 10:34:46 +0200 User-Agent: Mozilla Thunderbird From: Sfan5 To: ffmpeg-devel@ffmpeg.org Content-Language: en-US, de-DE X-TMN: [G65EfhgccqooZBWgteQ6CQVk9YTd70tnJyydGKponGlkOu+t6ibBKlabRbRiEboI75lW3kULx5I=] 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: <7391f771-531b-4eb0-b8c7-ab4cf27ef6c7@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: 9d2c9846-043c-41c5-79b6-08dc764c5dfb X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|3412199016|440099019|1602099003; X-Microsoft-Antispam-Message-Info: lCwBVaMqDrdQXXuqg9lGJanJUzXlnTHDOxOoSeqEEHk98DDRZLF6KaerQ02HEbctHxds2YiQNEXuXbbqCH3MP3rBzZYCdzsQ0yILU8fliFEUxZz8kLuoYtHLaeNv3WFO4QHGRXZ2nkrt+puA3fAgViEymV+xupm40HE+s3xdJ++UVKKS8HT5zE93KxmJsXFrHMQElTbRm4p9CgnviR6T8lL22m1X9hEBI/+5np9iZlt8OaJStki29uXqqridqEvXfjsUjLPL+kqyCnORbScVGdST7qLov+FNWUZ13KrQBK7l8yd0xgwkRAn+flcdhkBhyjjje8f4wsKUGKBd/BBQMUmcT5tbyMmfwivya+Huwv0sO5RXKVgYe9/P+mW+Wl90qjoOqjUOhRYi42vILSS/s+/2GgJXz/R3zltVVH1h7dSsclNfWmyW8IlR7+0y/Igo4R74X7KjPirWGlL2GwkAaVD6g/ZYCp0MgjRmLksLy45oqt9UfVNUwq4vA3gpxaJxc00cAEcYjzL7QUMdkL3jUngEG4orEQ2CCjc2TP24m7l5nu8t1JvRCiHpyKCclLioqxLnTTYvnYOVUT4Y+92dnUI7mFtqH1UnrN81Gh8cgUqdqcu4WZe3Iuxruvd8sa+D+88PZ+g543/prCODIsHw0gz9U2GWgDrPTRswPVQsQG4= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?TnXZoasZEmfmUMARE6yFpvecXPOD?= =?utf-8?q?RB+CIoKLnqGL+9dDDrTlOWoCVJoCrWoXDlCyCQd6juc7q6IkvLUVon3O1WikPOQU8?= =?utf-8?q?9uZCod6aqSyUOQt5lI/JFlA3LumHGhJuDegunP3wAiJvHHESjdC3fwr+BfRaniNly?= =?utf-8?q?fTwisvUi8c+79V1Ymo4axxb3PmP+6BhRoYO+5+sue8EtqMKOQeOrhIz5ADTexV1fL?= =?utf-8?q?7V2RAjt4LNCnIylAuC10d/dLMx/8m+KFdcZXGXeKdqK72AKjppkUZmQizG7BARO6A?= =?utf-8?q?Uxs/FgMRCPuF8vNEETk5A5nuhr405yGb1unWAVTGXIgfmY0JmrxcafAO8jkAJNf0k?= =?utf-8?q?7h1GWwT4QaVIr0HTPf+2Gc363G4chKPGWP4rfaNUVY48a1O0HaCOmuogS9HLNIGEj?= =?utf-8?q?YTLJIzYgu1P3/XXvkUM69Pgqr6USgJuWD9ehz0XIcRzm24Vf6VninwsBNc5NiZujV?= =?utf-8?q?zYV5Ex8juyc6dMBIjTKMWqw9q/XAf7ybtoqwv9Jn18AD5IYTS372Q3F/BIi0LMJMF?= =?utf-8?q?XTBuaxA2P+LLNV/Idnvhk4DNfY9+D/MW39vH3+JMBlSPw3R7uhYobHL4yFAtwd8dw?= =?utf-8?q?0CHhBd5j0PUqLQ6X4gf/2bpOuR4lpB8Tr37Au1C1+a1Svy+qWtdU0eFFjlau+qCUm?= =?utf-8?q?CV/k49zbcGUp+qM4EsG/QZbAxAcInvyV1g8Tl5NRs7GcrzRWYkEgl+CcOCJlQr+Hp?= =?utf-8?q?DBgHBrCSyuGKfhAePLEtfdTUNNbBLPLXkD4WuumhrO6EcZWJ2IagZFw9wlnVltbgU?= =?utf-8?q?l0c1APVMs76E9KTauwEsfY+UH2e8h5I9caPuvlitvEKAm8uqqyt5FMSSO/QrZvSJ/?= =?utf-8?q?kXjF27n1UA1dCY1SwQb/Qa/BjAKiCF0SOajoMLIEEXQf41zOxIHpxSTprnfKfEX9Q?= =?utf-8?q?G8fDvzUoQjOh8e7bxJ0oOzeuxcoFryrEipoyy2ASGo94NH542LE43kSm97DycyJoQ?= =?utf-8?q?fHlBRJ7x7rvbsLqu7fWPzOxg9+wlm4vC4ZVcNr13kKzd31avksurt37omo6vAEwoA?= =?utf-8?q?AfqdmTheCreaP4bRDE7QZtvy8b8kgjgia7HjyrtvrktV7ZFh0pgyM/hTLnJ9ci9Ox?= =?utf-8?q?rJ4mGcFQxVVGZkoMThcvIy4O4KDl3qELN0IPNkAKbfv54LOlyC2N8jy/KDFvMqGTE?= =?utf-8?q?2B3H2MZVqkUz1b/pBEeLRXNPTN+rRPW60BB5yhiqmsOb6Fxv6kUdG1fjotOh/T6yW?= =?utf-8?q?wqGVVzHuS6IUnIEz593FzvheeFs3fjlGDtM6AkqI0+WNAMv8UCxSxFqSfg88=3D?= X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-76d7b.templateTenant X-MS-Exchange-CrossTenant-Network-Message-Id: 9d2c9846-043c-41c5-79b6-08dc764c5dfb 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:54.8768 (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 5/6] lavf/tls_mbedtls: handle session ticket error code as no-op 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: 1Ph+DkqnSZCx 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(+) case MBEDTLS_ERR_NET_RECV_FAILED: diff --git a/libavformat/tls_mbedtls.c b/libavformat/tls_mbedtls.c index 67d5c568b9..8268e74638 100644 --- a/libavformat/tls_mbedtls.c +++ b/libavformat/tls_mbedtls.c @@ -322,6 +322,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: