mirror of
https://github.com/openssl/openssl.git
synced 2024-11-27 05:21:51 +08:00
Adds casts for 64-bit
Adds missing casts for 64-bit. Removed zero initialization of hProvider. hProvider is an "out" parameter of CryptAcquireContextW. Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/1142)
This commit is contained in:
parent
0814afcfa4
commit
e56f956ef1
@ -37,7 +37,7 @@ int RAND_poll(void)
|
||||
{
|
||||
MEMORYSTATUS mst;
|
||||
# ifndef USE_BCRYPT
|
||||
HCRYPTPROV hProvider = 0;
|
||||
HCRYPTPROV hProvider;
|
||||
# endif
|
||||
DWORD w;
|
||||
BYTE buf[64];
|
||||
@ -50,7 +50,7 @@ int RAND_poll(void)
|
||||
/* poll the CryptoAPI PRNG */
|
||||
/* The CryptoAPI returns sizeof(buf) bytes of randomness */
|
||||
if (CryptAcquireContextW(&hProvider, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT | CRYPT_SILENT)) {
|
||||
if (CryptGenRandom(hProvider, sizeof(buf), buf) != 0) {
|
||||
if (CryptGenRandom(hProvider, (DWORD)sizeof(buf), buf) != 0) {
|
||||
RAND_add(buf, sizeof(buf), sizeof(buf));
|
||||
}
|
||||
CryptReleaseContext(hProvider, 0);
|
||||
@ -58,7 +58,7 @@ int RAND_poll(void)
|
||||
|
||||
/* poll the Pentium PRG with CryptoAPI */
|
||||
if (CryptAcquireContextW(&hProvider, NULL, INTEL_DEF_PROV, PROV_INTEL_SEC, CRYPT_VERIFYCONTEXT | CRYPT_SILENT)) {
|
||||
if (CryptGenRandom(hProvider, sizeof(buf), buf) != 0) {
|
||||
if (CryptGenRandom(hProvider, (DWORD)sizeof(buf), buf) != 0) {
|
||||
RAND_add(buf, sizeof(buf), sizeof(buf));
|
||||
}
|
||||
CryptReleaseContext(hProvider, 0);
|
||||
|
Loading…
Reference in New Issue
Block a user