diff options
author | Aaron Ballman <aaron@aaronballman.com> | 2014-02-11 02:47:33 +0000 |
---|---|---|
committer | Aaron Ballman <aaron@aaronballman.com> | 2014-02-11 02:47:33 +0000 |
commit | 91b585bccc23fafe004024c47fa555a638547a2b (patch) | |
tree | e67766a0c80aaea9dbf990c93f5ba56ac1839579 /lib/Support | |
parent | 921f0b1d6695241f5e3ac4af0ac3a6c677055d7c (diff) | |
download | llvm-91b585bccc23fafe004024c47fa555a638547a2b.tar.gz llvm-91b585bccc23fafe004024c47fa555a638547a2b.tar.bz2 llvm-91b585bccc23fafe004024c47fa555a638547a2b.tar.xz |
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
Diffstat (limited to 'lib/Support')
-rw-r--r-- | lib/Support/Process.cpp | 5 | ||||
-rw-r--r-- | lib/Support/Windows/Process.inc | 15 |
2 files changed, 11 insertions, 9 deletions
diff --git a/lib/Support/Process.cpp b/lib/Support/Process.cpp index 1360842753..d5168f03a6 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 <stdlib.h> -#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 62b6da0cb1..a0e3bc413a 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<BYTE *>(&Ret))) + assert(false && "Could not generate a random number"); + return Ret; } |