From patchwork Fri Sep 15 08:04:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tatsuyuki Ishi X-Patchwork-Id: 5148 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.36.26 with SMTP id f26csp378532jaa; Fri, 15 Sep 2017 01:12:52 -0700 (PDT) X-Received: by 10.28.197.133 with SMTP id v127mr2217229wmf.52.1505463172731; Fri, 15 Sep 2017 01:12:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505463172; cv=none; d=google.com; s=arc-20160816; b=FQHwMfpCnT0t7/fmNfZE2ZhEis0FOctX9QFk6S2p6JWyJ1xRJ4Q4DDOE3t++AfGN0u j8EM28uOZIdJqtuj4TznamJUVTryx0Z1cYti48W6fl71njixR9MiCCjIxSppIa75SReS DqYuOapgPFch6lDWcR1s2nhvy8D7GtxqS8hhhHsXq6hy2p36U3THxZQ2twUvmxymMZQ3 Wy3DR/fe4wa9pGjMEU7uFWTD788NuS7tk52REloldcT1tkAwFJXkXEpaRr76PuzIkFXd H3QmMVhcaMcUfTxIuu7unFsMR0zJqQvFcMTvDDttelWkURXYHXQUIxHyeWX1SjAFB0Mz XFYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:to:message-id:date:from:mime-version :dkim-signature:delivered-to:arc-authentication-results; bh=xe7x7nwXTkRtstFWNFUjO5aF5ZMDl9CWqS0DObl2Eo8=; b=DyVL00Urw0oGUqsnqCnXutNpCJcd6h0omowREGdWHgYDc5TaQZhcgf5nHKinRaMd/F 27Ybla+IuE/1S45xSJugLjswWyJyeEMkpBQtoH8RWuoDxA8PwMJicUYTDtSju2tGe6sF 2bwhAmZ2XOZ+iojSMOY1QvZ2rWqQ0XmskW7dabtvD7aqOXiJ7E7oV/9hv24B+LIgL08Y EyndtGm94bPjujshUbEUdIMPNDVHKh92NzPUzsbe5ZL67uQJO/Wrtg6VLWGSwkorWfCr nHGubFXB8ePa1q7sSROFcguHa3RE33geu54HZzFsaEK/MzuuJieVeOdMLKe5Z445h33x MYFA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=WmoqIOP0; 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=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 9si546779wmq.143.2017.09.15.01.12.51; Fri, 15 Sep 2017 01:12:52 -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=@gmail.com header.s=20161025 header.b=WmoqIOP0; 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=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CFA22689C70; Fri, 15 Sep 2017 11:12:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f180.google.com (mail-qk0-f180.google.com [209.85.220.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 733DB689982 for ; Fri, 15 Sep 2017 11:12:37 +0300 (EEST) Received: by mail-qk0-f180.google.com with SMTP id r141so1464928qke.2 for ; Fri, 15 Sep 2017 01:12:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=FmHQ7xTLTBFCqG82aIgf+O2VMi3/097jvNkBx1ZQQNc=; b=WmoqIOP04v+ebOug/gABxiLOOn2TVrCwF30nkclFAPNf2edFlcaUQGb0LQDAa+NAwq pgop27Bcf4OE7dTh3mUBti4xmr8RQqVfI/OrVhTMcE66Kkj8OxHmzQcHfPulsMz2o2qK gg9IKN4QtLt9Zb/qnH1MwAxXzTTStocM2txQlOspC7pdD1Lsh4kAoki2JbDj7E4vJnJI RzCT7NwCbP0FlGjBPRGxtuf1bAhAPNJWG4mjdsFnWpeZoiTAhIJmZeRp3tUXMIF8padQ nyFXolbBsJLSeX61VipYom0xN+7uVA/fKzXMysLAF7mV/NBkUO6sr7TYMUrRYha5+W7g 6wGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=FmHQ7xTLTBFCqG82aIgf+O2VMi3/097jvNkBx1ZQQNc=; b=nhfT8uH6SUtdvdj858URWkEOqwdilduIKdB5lb+83ANM5x2LNDSDnmPpS+IU5OkCMD DoydfPRtceD6h6QgsXu/tLfF+AgG/57ZxKsKgm9PPC1pdBeAUY0DcTyQlIynWFLacnle 8/D1hUfOR6kPViUw6mdJJEaHO8OMTLbcOaTfnK/X21FsYkBRurEuCX3f5fmw50tXSqQ/ PkNRMWkFWqjHTo+bmV4t4J8zZ9BEibyvoM4ZewGQ2JnHmx0wziolOalMWi1AMSR7NOJQ L+PrkfY0Cgp7z94kT0eeK8mFufNhtDMohCV/3hO6cUx0XnIRpvTk5we6JtvK2jqfODBW 6+iQ== X-Gm-Message-State: AHPjjUj2l0K47uuQlT6ieJwkiYSfabdqxzomCykHaz5WbmbmuNmf/hKf J1hu3e6wUgSuqcwXI3oBX69RfgY4QZeDxOtGvoK0LfNp X-Google-Smtp-Source: AOwi7QAo/dIcva+JN5u/BLvlmu9JYA5VlGlFwiP6f3zKtVHAUqiSppmDfjF2xDPrtwwW6C4KnkhE0UZHdsWKXEeniVw= X-Received: by 10.55.149.2 with SMTP id x2mr6720886qkd.23.1505462679160; Fri, 15 Sep 2017 01:04:39 -0700 (PDT) MIME-Version: 1.0 Received: by 10.140.33.199 with HTTP; Fri, 15 Sep 2017 01:04:38 -0700 (PDT) From: Tatsuyuki Ishi Date: Fri, 15 Sep 2017 17:04:38 +0900 Message-ID: To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH] GnuTLS: eat PREMATURE_TERMINATION error 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Subject: [PATCH] GnuTLS: eat PREMATURE_TERMINATION error GnuTLS is too strict on the SSL shutdown alert, and it's neither mandatory in the spec or critical. As it's ignored in OpenSSL, we should also suppress it in GnuTLS as well. Ticket: #6667 --- libavformat/tls_gnutls.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavformat/tls_gnutls.c b/libavformat/tls_gnutls.c index ecc80bf..38f8ea4 100644 --- a/libavformat/tls_gnutls.c +++ b/libavformat/tls_gnutls.c @@ -72,6 +72,7 @@ static int print_tls_error(URLContext *h, int ret) switch (ret) { case GNUTLS_E_AGAIN: case GNUTLS_E_INTERRUPTED: + case GNUTLS_E_PREMATURE_TERMINATION: break; case GNUTLS_E_WARNING_ALERT_RECEIVED: av_log(h, AV_LOG_WARNING, "%s\n", gnutls_strerror(ret));