From 1093383d6cf7112d54b849e29c739e957d157b25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Thu, 11 Oct 2012 14:30:23 +0300 Subject: [PATCH] random_seed: Support using CryptGenRandom on windows MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Martin Storsjö --- configure | 2 ++ libavutil/random_seed.c | 15 +++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/configure b/configure index 17f38ec875..67f88eb0fd 100755 --- a/configure +++ b/configure @@ -1139,6 +1139,7 @@ HAVE_LIST=" closesocket cmov cpunop + CryptGenRandom dcbzl dev_bktr_ioctl_bt848_h dev_bktr_ioctl_meteor_h @@ -3202,6 +3203,7 @@ check_func sysctl check_func usleep check_func_headers io.h setmode check_lib2 "windows.h shellapi.h" CommandLineToArgvW -lshell32 +check_lib2 "windows.h wincrypt.h" CryptGenRandom -ladvapi32 check_lib2 "windows.h psapi.h" GetProcessMemoryInfo -lpsapi check_func_headers windows.h GetProcessAffinityMask check_func_headers windows.h GetProcessTimes diff --git a/libavutil/random_seed.c b/libavutil/random_seed.c index 8ee4cb716e..ec9caa74b7 100644 --- a/libavutil/random_seed.c +++ b/libavutil/random_seed.c @@ -23,6 +23,10 @@ #if HAVE_UNISTD_H #include #endif +#if HAVE_CRYPTGENRANDOM +#include +#include +#endif #include #include #include @@ -82,6 +86,17 @@ uint32_t av_get_random_seed(void) { uint32_t seed; +#if HAVE_CRYPTGENRANDOM + HCRYPTPROV provider; + if (CryptAcquireContext(&provider, NULL, NULL, PROV_RSA_FULL, + CRYPT_VERIFYCONTEXT | CRYPT_SILENT)) { + BOOL ret = CryptGenRandom(provider, sizeof(seed), (PBYTE) &seed); + CryptReleaseContext(provider, 0); + if (ret) + return seed; + } +#endif + if (read_random(&seed, "/dev/urandom") == sizeof(seed)) return seed; if (read_random(&seed, "/dev/random") == sizeof(seed))