har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/hlsenc: use av_random_bytes() for generating AES128 key

Browse Source 
av_random_bytes() can use OS provided strong random functions and does not
depend soley on openssl/gcrypt external libraries.

Fixes ticket #10441.

Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Marton Balint 2023-07-02 20:57:47 +02:00
parent 9a7f060c32
commit 36f4e6f8f4
2 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure vendored
View File

@ -3507,7 +3507,6 @@ gxf_muxer_select="pcm_rechunk_bsf"
hds_muxer_select="flv_muxer" hds_muxer_select="flv_muxer"
hls_demuxer_select="adts_header ac3_parser mov_demuxer mpegts_demuxer" hls_demuxer_select="adts_header ac3_parser mov_demuxer mpegts_demuxer"
hls_muxer_select="mov_muxer mpegts_muxer" hls_muxer_select="mov_muxer mpegts_muxer"
hls_muxer_suggest="gcrypt openssl"
image2_alias_pix_demuxer_select="image2_demuxer" image2_alias_pix_demuxer_select="image2_demuxer"
image2_brender_pix_demuxer_select="image2_demuxer" image2_brender_pix_demuxer_select="image2_demuxer"
imf_demuxer_deps="libxml2" imf_demuxer_deps="libxml2"

23
libavformat/hlsenc.c
View File

@ -27,12 +27,6 @@
#include <unistd.h> #include <unistd.h>
#endif #endif
#if CONFIG_GCRYPT
#include <gcrypt.h>
#elif CONFIG_OPENSSL
#include <openssl/rand.h>
#endif
#include "libavutil/avassert.h" #include "libavutil/avassert.h"
#include "libavutil/mathematics.h" #include "libavutil/mathematics.h"
#include "libavutil/avstring.h" #include "libavutil/avstring.h"
@ -40,6 +34,7 @@
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include "libavutil/log.h" #include "libavutil/log.h"
#include "libavutil/random_seed.h"
#include "libavutil/time.h" #include "libavutil/time.h"
#include "libavutil/time_internal.h" #include "libavutil/time_internal.h"
@ -710,20 +705,6 @@ fail:
return ret; return ret;
} }
static int randomize(uint8_t *buf, int len)
{
#if CONFIG_GCRYPT
gcry_randomize(buf, len, GCRY_VERY_STRONG_RANDOM);
return 0;
#elif CONFIG_OPENSSL
if (RAND_bytes(buf, len))
return 0;
#else
return AVERROR(ENOSYS);
#endif
return AVERROR(EINVAL);
}
static int do_encrypt(AVFormatContext *s, VariantStream *vs) static int do_encrypt(AVFormatContext *s, VariantStream *vs)
{ {
HLSContext *hls = s->priv_data; HLSContext *hls = s->priv_data;
@ -775,7 +756,7 @@ static int do_encrypt(AVFormatContext *s, VariantStream *vs)
if (!*hls->key_string) { if (!*hls->key_string) {
AVDictionary *options = NULL; AVDictionary *options = NULL;
if (!hls->key) { if (!hls->key) {
if ((ret = randomize(key, sizeof(key))) < 0) { if ((ret = av_random_bytes(key, sizeof(key))) < 0) {
av_log(s, AV_LOG_ERROR, "Cannot generate a strong random key\n"); av_log(s, AV_LOG_ERROR, "Cannot generate a strong random key\n");
return ret; return ret;
} }