[FFmpeg-cvslog] avutil/random_seed: add support for gcrypt and OpenSSL as source of randomness
James Almer
git at videolan.org
Thu Jul 6 21:32:49 EEST 2023
ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Tue Jul 4 19:49:23 2023 -0300| [b7f4d5fa7e04498fddd60d298bc4a95241a581da] | committer: James Almer
avutil/random_seed: add support for gcrypt and OpenSSL as source of randomness
Reviewed-by: Anton Khirnov <anton at khirnov.net>
Signed-off-by: James Almer <jamrial at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b7f4d5fa7e04498fddd60d298bc4a95241a581da
---
configure | 2 +-
libavutil/random_seed.c | 16 ++++++++++++++++
2 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/configure b/configure
index 107d533b3e..d6e78297fe 100755
--- a/configure
+++ b/configure
@@ -3892,7 +3892,7 @@ avfilter_deps="avutil"
avfilter_suggest="libm stdatomic"
avformat_deps="avcodec avutil"
avformat_suggest="libm network zlib stdatomic"
-avutil_suggest="clock_gettime ffnvcodec libm libdrm libmfx opencl user32 vaapi vulkan videotoolbox corefoundation corevideo coremedia bcrypt stdatomic"
+avutil_suggest="clock_gettime ffnvcodec gcrypt libm libdrm libmfx opencl openssl user32 vaapi vulkan videotoolbox corefoundation corevideo coremedia bcrypt stdatomic"
postproc_deps="avutil gpl"
postproc_suggest="libm stdatomic"
swresample_deps="avutil"
diff --git a/libavutil/random_seed.c b/libavutil/random_seed.c
index f5c291263e..2980e565e0 100644
--- a/libavutil/random_seed.c
+++ b/libavutil/random_seed.c
@@ -30,6 +30,11 @@
#include <windows.h>
#include <bcrypt.h>
#endif
+#if CONFIG_GCRYPT
+#include <gcrypt.h>
+#elif CONFIG_OPENSSL
+#include <openssl/rand.h>
+#endif
#include <fcntl.h>
#include <math.h>
#include <time.h>
@@ -143,6 +148,17 @@ int av_random_bytes(uint8_t* buf, size_t len)
#endif
err = read_random(buf, len, "/dev/urandom");
+ if (!err)
+ return err;
+
+#if CONFIG_GCRYPT
+ gcry_randomize(buf, len, GCRY_VERY_STRONG_RANDOM);
+ return 0;
+#elif CONFIG_OPENSSL
+ if (RAND_bytes(buf, len) == 1)
+ return 0;
+ err = AVERROR_EXTERNAL;
+#endif
return err;
}
More information about the ffmpeg-cvslog
mailing list