From: Marton Balint <cus@passwd.hu>
To: ffmpeg-devel@ffmpeg.org
Cc: Marton Balint <cus@passwd.hu>
Subject: [FFmpeg-devel] [PATCH 2/2] avformat/hlsenc: remove openssl/gcrypt random key generation
Date: Sun, 2 Jul 2023 21:30:10 +0200
Message-ID: <20230702193010.11654-2-cus@passwd.hu> (raw)
In-Reply-To: <20230702193010.11654-1-cus@passwd.hu>
av_get_random_seed() should be sufficent and that is used everywhere in the
codebase for similar cases.
Signed-off-by: Marton Balint <cus@passwd.hu>
---
configure | 1 -
libavformat/hlsenc.c | 13 -------------
2 files changed, 14 deletions(-)
diff --git a/configure b/configure
index 107d533b3e..b331b2e9db 100755
--- a/configure
+++ b/configure
@@ -3507,7 +3507,6 @@ gxf_muxer_select="pcm_rechunk_bsf"
hds_muxer_select="flv_muxer"
hls_demuxer_select="adts_header ac3_parser mov_demuxer mpegts_demuxer"
hls_muxer_select="mov_muxer mpegts_muxer"
-hls_muxer_suggest="gcrypt openssl"
image2_alias_pix_demuxer_select="image2_demuxer"
image2_brender_pix_demuxer_select="image2_demuxer"
imf_demuxer_deps="libxml2"
diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
index 0b22c71186..f2284e8ea0 100644
--- a/libavformat/hlsenc.c
+++ b/libavformat/hlsenc.c
@@ -27,12 +27,6 @@
#include <unistd.h>
#endif
-#if CONFIG_GCRYPT
-#include <gcrypt.h>
-#elif CONFIG_OPENSSL
-#include <openssl/rand.h>
-#endif
-
#include "libavutil/avassert.h"
#include "libavutil/mathematics.h"
#include "libavutil/avstring.h"
@@ -713,13 +707,6 @@ fail:
static void randomize(uint8_t *buf, int len)
{
-#if CONFIG_GCRYPT
- gcry_randomize(buf, len, GCRY_VERY_STRONG_RANDOM);
- return;
-#elif CONFIG_OPENSSL
- if (RAND_bytes(buf, len))
- return;
-#endif
av_assert0(len % 4 == 0);
for (int i = 0; i < len; i += 4)
AV_WB32(buf + i, av_get_random_seed());
--
2.35.3
_______________________________________________
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".
next prev parent reply other threads:[~2023-07-02 19:30 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-02 19:30 [FFmpeg-devel] [PATCH 1/2] avformat/hlsenc: fall back to av_get_random_seed() when generating AES128 key Marton Balint
2023-07-02 19:30 ` Marton Balint [this message]
2023-07-03 2:21 ` [FFmpeg-devel] [PATCH 2/2] avformat/hlsenc: remove openssl/gcrypt random key generation Steven Liu
2023-07-03 2:20 ` [FFmpeg-devel] [PATCH 1/2] avformat/hlsenc: fall back to av_get_random_seed() when generating AES128 key Steven Liu
2023-07-03 19:23 ` Marton Balint
2023-07-03 19:33 ` James Almer
2023-07-03 20:15 ` Anton Khirnov
2023-07-03 20:54 ` Marton Balint
2023-07-03 21:09 ` Anton Khirnov
2023-07-03 21:52 ` Marton Balint
2023-07-04 19:02 ` James Almer
2023-07-04 19:30 ` Marton Balint
2023-07-06 17:01 ` [FFmpeg-devel] [PATCH] avformat/hlsenc: use av_random_bytes() for " Marton Balint
2023-07-14 19:39 ` Marton Balint
2023-07-03 23:50 ` [FFmpeg-devel] [PATCH 1/2] avformat/hlsenc: fall back to av_get_random_seed() when " Michael Niedermayer
2023-07-04 5:54 ` Anton Khirnov
2023-07-04 9:08 ` Kieran Kunhya
2023-07-04 14:37 ` James Almer
2023-07-04 15:31 ` Anton Khirnov
2023-07-04 23:50 ` Michael Niedermayer
2023-07-05 9:22 ` Anton Khirnov
2023-07-05 22:54 ` Michael Niedermayer
2023-07-06 7:52 ` Anton Khirnov
2023-07-06 23:34 ` Kieran Kunhya
2023-07-07 0:55 ` Michael Niedermayer
2023-07-07 8:05 ` Anton Khirnov
2023-07-07 14:42 ` Michael Niedermayer
2023-07-03 20:20 ` Marton Balint
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230702193010.11654-2-cus@passwd.hu \
--to=cus@passwd.hu \
--cc=ffmpeg-devel@ffmpeg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git