From: Aaron Ballman Date: Tue, 11 Feb 2014 02:47:33 +0000 (+0000) Subject: Hopefully fixing the MinGW 32 build, which was broken by r200767. Not using rand_s... X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=91b585bccc23fafe004024c47fa555a638547a2b;p=oota-llvm.git Hopefully fixing the MinGW 32 build, which was broken by r200767. Not using rand_s() since MinGW does not have an implementation for it, but instead using the underlying CryptGenRandom APIs. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@201124 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/Support/Process.cpp b/lib/Support/Process.cpp index 1360842753d..d5168f03a6d 100644 --- a/lib/Support/Process.cpp +++ b/lib/Support/Process.cpp @@ -12,11 +12,6 @@ //===----------------------------------------------------------------------===// #include "llvm/Config/config.h" -#if LLVM_ON_WIN32 - // This define makes stdlib.h declare the rand_s function. -#define _CRT_RAND_S -#include -#endif #include "llvm/Support/ErrorHandling.h" #include "llvm/Support/Process.h" diff --git a/lib/Support/Windows/Process.inc b/lib/Support/Windows/Process.inc index 62b6da0cb1b..a0e3bc413a3 100644 --- a/lib/Support/Windows/Process.inc +++ b/lib/Support/Windows/Process.inc @@ -362,8 +362,15 @@ const char *Process::ResetColor() { } unsigned Process::GetRandomNumber() { - unsigned int result; - const int ec = rand_s(&result); - assert(ec == 0 && "rand_s failed"); - return result; + HCRYPTPROV HCPC; + if (!::CryptAcquireContextW(&HCPC, NULL, NULL, PROV_RSA_FULL, + CRYPT_VERIFYCONTEXT)) + assert(false && "Could not acquire a cryptographic context"); + + ScopedCryptContext CryptoProvider(HCPC); + unsigned Ret; + if (!::CryptGenRandom(CryptoProvider, sizeof(Ret), + reinterpret_cast(&Ret))) + assert(false && "Could not generate a random number"); + return Ret; }