From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id D9D7247A3A for ; Fri, 29 Sep 2023 16:25:43 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4CC0B68CC54; Fri, 29 Sep 2023 19:25:41 +0300 (EEST) Received: from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net [217.70.183.200]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7D93168CC4B for ; Fri, 29 Sep 2023 19:25:34 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id AB2F22000B for ; Fri, 29 Sep 2023 16:25:33 +0000 (UTC) Date: Fri, 29 Sep 2023 18:25:32 +0200 From: Michael Niedermayer To: FFmpeg development discussions and patches Message-ID: <20230929162532.GD3543730@pb2> References: MIME-Version: 1.0 In-Reply-To: X-GND-Sasl: michael@niedermayer.cc Subject: Re: [FFmpeg-devel] [PATCH] avformat/hls: Re-use crypto URLContext 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 Content-Type: multipart/mixed; boundary="===============9080061479962480940==" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --===============9080061479962480940== Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="4AmJdx/+JAF2YHMk" Content-Disposition: inline --4AmJdx/+JAF2YHMk Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Sep 29, 2023 at 05:10:18PM +0200, Luis Scheurenbrand via ffmpeg-dev= el wrote: > Reset crypto state and keep nested http context alive. > Previously, an unencrypted file, followed by an encrypted file would > result in a corrupted stream, as the stream would not be closed and > an encrypted file would be forwarded to the demuxer. >=20 > fixes: https://trac.ffmpeg.org/ticket/10599 > fixes: https://trac.ffmpeg.org/ticket/8490 > Signed-off-by: Luis Scheurenbrand > --- > libavformat/crypto.c | 55 ++++++++++++++++++++++++++++++++++++++++++++ > libavformat/crypto.h | 38 ++++++++++++++++++++++++++++++ > libavformat/hls.c | 32 ++++++++++++++++++++++---- > 3 files changed, 120 insertions(+), 5 deletions(-) > create mode 100644 libavformat/crypto.h >=20 > diff --git a/libavformat/crypto.c b/libavformat/crypto.c > index 75b00020bc..543300c7c0 100644 > --- a/libavformat/crypto.c > +++ b/libavformat/crypto.c > @@ -20,8 +20,10 @@ > */ > #include "libavutil/aes.h" > +#include "libavutil/avassert.h" > #include "libavutil/avstring.h" > #include "libavutil/opt.h" > +#include "crypto.h" > #include "url.h" > // encourage reads of 4096 bytes - 1 block is always retained. > @@ -105,6 +107,59 @@ static int set_aes_arg(URLContext *h, uint8_t **buf, > int *buf_len, > return 0; this patch is corrupted with newlines, check the word/line wraping settings of your mail setup Applying: avformat/hls: Re-use crypto URLContext error: corrupt patch at line 21 error: could not build fake ancestor [...] --=20 Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB Those who are best at talking, realize last or never when they are wrong. --4AmJdx/+JAF2YHMk Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iF0EABEIAB0WIQSf8hKLFH72cwut8TNhHseHBAsPqwUCZRb6fAAKCRBhHseHBAsP qykwAJsH6ZB/KTtFfPb8rlJjynF2t0gMlwCfcnS3qXPggJ45fRaeXXQN7b5hiR4= =uee9 -----END PGP SIGNATURE----- --4AmJdx/+JAF2YHMk-- --===============9080061479962480940== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". --===============9080061479962480940==--