Commit 3f272009 authored by James Almer's avatar James Almer

Merge commit '7ac092d0'

* commit '7ac092d0':
  build: CryptGenRandom --> wincrypt, it is a better name
Merged-by: 's avatarJames Almer <jamrial@gmail.com>
parents 8882e8ad 7ac092d0
...@@ -1992,7 +1992,6 @@ SYSTEM_FUNCS=" ...@@ -1992,7 +1992,6 @@ SYSTEM_FUNCS="
clock_gettime clock_gettime
closesocket closesocket
CommandLineToArgvW CommandLineToArgvW
CryptGenRandom
fcntl fcntl
getaddrinfo getaddrinfo
gethrtime gethrtime
...@@ -2113,6 +2112,7 @@ HAVE_LIST=" ...@@ -2113,6 +2112,7 @@ HAVE_LIST="
vaapi_x11 vaapi_x11
vdpau_x11 vdpau_x11
winrt winrt
wincrypt
" "
# options emitted with CONFIG_ prefix but not available on the command line # options emitted with CONFIG_ prefix but not available on the command line
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#if HAVE_IO_H #if HAVE_IO_H
#include <io.h> #include <io.h>
#endif #endif
#if HAVE_CRYPTGENRANDOM #if HAVE_WINCRYPT
#include <windows.h> #include <windows.h>
#include <wincrypt.h> #include <wincrypt.h>
#endif #endif
...@@ -121,7 +121,7 @@ uint32_t av_get_random_seed(void) ...@@ -121,7 +121,7 @@ uint32_t av_get_random_seed(void)
{ {
uint32_t seed; uint32_t seed;
#if HAVE_CRYPTGENRANDOM #if HAVE_WINCRYPT
HCRYPTPROV provider; HCRYPTPROV provider;
if (CryptAcquireContext(&provider, NULL, NULL, PROV_RSA_FULL, if (CryptAcquireContext(&provider, NULL, NULL, PROV_RSA_FULL,
CRYPT_VERIFYCONTEXT | CRYPT_SILENT)) { CRYPT_VERIFYCONTEXT | CRYPT_SILENT)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment