From patchwork Wed Feb 12 23:39:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tristan Matthews X-Patchwork-Id: 17769 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 4BFA244B952 for ; Thu, 13 Feb 2020 01:46:26 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 251DA68AE48; Thu, 13 Feb 2020 01:46:26 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f193.google.com (mail-qt1-f193.google.com [209.85.160.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E654768A3A4 for ; Thu, 13 Feb 2020 01:46:19 +0200 (EET) Received: by mail-qt1-f193.google.com with SMTP id d9so3027703qte.12 for ; Wed, 12 Feb 2020 15:46:19 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=PJpfNlA0ya7ZIwwyMm1Uj1KMg6sOIxB5O6VYX72VzhI=; b=VZAgrlPLtXo3DNZeYOwFMgPRvjVC8SWDZCzmAfT1t9jJ66jZyY5rhLH3aBGKaQuVsQ 8qNT3ibD73nebHkVjwnJm7qSCUniHhZcLOHEa/G8mKr3psN7Ypaiu4zowXJr9kTEXR8O b3vWXMHmLiEMHDkiYLKOJv2XV0LiOuPGHyo2x/5t26U81EXa8KoEVAFjGAIh+79XGDvr 1izDIiGqwUbfSOEkv6do+IW2UUg4AYwxWIOQdB24zyAmNr6p/qHB+hjQUvd58PQPXDbL AuWHY1HXVFa2m3UbmNRE8hruy8rOZgN8EJwOQ5aeI1EGXCSr5O5JxdSXq4q3dvSaBltn rpwQ== X-Gm-Message-State: APjAAAW6IyGE5XFy3ORFH8qaJFMYcTj/F19KDwMoQYPHHwuTisHAGpId rWfGW95Hodkl+kAF65XuGZq8TPv+ X-Google-Smtp-Source: APXvYqx+YMWVvYBNWidHGUUY77f2eLDccZ0mNYkqY2r8JCHxotUGKYH0MUhGmyA7nyqq1Uj5FvnG0w== X-Received: by 2002:ac8:425a:: with SMTP id r26mr21447511qtm.138.1581550791879; Wed, 12 Feb 2020 15:39:51 -0800 (PST) Received: from bellini.lan (192-222-144-238.qc.cable.ebox.net. [192.222.144.238]) by smtp.gmail.com with ESMTPSA id u13sm395869qtg.64.2020.02.12.15.39.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Feb 2020 15:39:51 -0800 (PST) From: Tristan Matthews To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Feb 2020 18:39:43 -0500 Message-Id: <20200212233943.32333-1-tmatth@videolan.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/1] ffmpeg: gnutls: ignore TLS rehandshake requests X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Cc: Tristan Matthews Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Log a warning instead of terminating. TLS does not explicitly require that the client initiate the handshake when requested by the server, it can be ignored (although the server is free to break the connection if no handshake is forthcoming). https://www.gnutls.org/manual/html_node/Core-TLS-API.html#gnutls_005frehandshake --- libavformat/tls_gnutls.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavformat/tls_gnutls.c b/libavformat/tls_gnutls.c index f32bc2821b..db9d50b586 100644 --- a/libavformat/tls_gnutls.c +++ b/libavformat/tls_gnutls.c @@ -81,6 +81,9 @@ static int print_tls_error(URLContext *h, int ret) case GNUTLS_E_PREMATURE_TERMINATION: #endif break; + case GNUTLS_E_REHANDSHAKE: + av_log(h, AV_LOG_WARNING, "%s\n", gnutls_strerror(ret)); + return 0; case GNUTLS_E_WARNING_ALERT_RECEIVED: av_log(h, AV_LOG_WARNING, "%s\n", gnutls_strerror(ret)); break;