1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Check the reading size range

Browse Source
This commit is contained in:
Nobuyoshi Nakada 2021-08-23 23:41:45 +09:00
parent e5792e7d55
commit 66b0847602
No known key found for this signature in database
GPG Key ID: 7CD2805BFA3770C6
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
random.c
View File

@ -538,6 +538,11 @@ fill_random_bytes_syscall(void *buf, size_t size, int unused)
#endif #endif
} }
#elif defined(_WIN32) #elif defined(_WIN32)
#ifndef DWORD_MAX
# define DWORD_MAX (~(DWORD)0UL)
#endif
# if defined(CRYPT_VERIFYCONTEXT) # if defined(CRYPT_VERIFYCONTEXT)
STATIC_ASSERT(sizeof_HCRYPTPROV, sizeof(HCRYPTPROV) == sizeof(size_t)); STATIC_ASSERT(sizeof_HCRYPTPROV, sizeof(HCRYPTPROV) == sizeof(size_t));
@ -580,7 +585,12 @@ fill_random_bytes_crypt(void *seed, size_t size)
} }
} }
if (prov == INVALID_HCRYPTPROV) return -1; if (prov == INVALID_HCRYPTPROV) return -1;
CryptGenRandom(prov, size, seed); while (size > 0) {
DWORD n = (size > (size_t)DWORD_MAX) ? DWORD_MAX : (DWORD)size;
if (!CryptGenRandom(prov, n, seed)) return -1;
seed = (char *)seed + n;
size -= n;
}
return 0; return 0;
} }
# else # else
@ -590,9 +600,14 @@ fill_random_bytes_crypt(void *seed, size_t size)
static int static int
fill_random_bytes_bcrypt(void *seed, size_t size) fill_random_bytes_bcrypt(void *seed, size_t size)
{ {
if (!BCryptGenRandom(NULL, seed, size, BCRYPT_USE_SYSTEM_PREFERRED_RNG)) while (size > 0) {
return 0; ULONG n = (size > (size_t)ULONG_MAX) ? LONG_MAX : (ULONG)size;
if (BCryptGenRandom(NULL, seed, n, BCRYPT_USE_SYSTEM_PREFERRED_RNG))
return -1; return -1;
seed = (char *)seed + n;
size -= n;
}
return 0;
} }
static int static int