diff options
| author | Benjamin Peterson <benjamin@python.org> | 2012-02-21 16:08:50 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2012-02-21 16:08:50 (GMT) |
| commit | 26da920001941b0cd74981772924a6aab4d2881a (patch) | |
| tree | 89683553a0a02950f41b652e225b062736ed1ae7 /Python | |
| parent | b69fa1f8b7b935c79b193502358bd59b685afd77 (diff) | |
| download | cpython-26da920001941b0cd74981772924a6aab4d2881a.zip cpython-26da920001941b0cd74981772924a6aab4d2881a.tar.gz cpython-26da920001941b0cd74981772924a6aab4d2881a.tar.bz2 | |
ensure no one tries to hash things before the random seed is found
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/random.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/Python/random.c b/Python/random.c index 01cd83a..a2ae002 100644 --- a/Python/random.c +++ b/Python/random.c @@ -5,7 +5,11 @@ #include <fcntl.h> #endif -static int random_initialized = 0; +#ifdef Py_DEBUG +int _Py_HashSecret_Initialized = 0; +#else +static int _Py_HashSecret_Initialized = 0; +#endif #ifdef MS_WINDOWS typedef BOOL (WINAPI *CRYPTACQUIRECONTEXTA)(HCRYPTPROV *phProv,\ @@ -246,11 +250,11 @@ _PyRandom_Init(void) { char *env; void *secret = &_Py_HashSecret; - Py_ssize_t secret_size = sizeof(_Py_HashSecret); + Py_ssize_t secret_size = sizeof(_Py_HashSecret_t); - if (random_initialized) + if (_Py_HashSecret_Initialized) return; - random_initialized = 1; + _Py_HashSecret_Initialized = 1; /* By default, hash randomization is disabled, and only |