summaryrefslogtreecommitdiff
path: root/Python/random.c
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2014-11-02 13:19:15 -0500
committerBenjamin Peterson <benjamin@python.org>2014-11-02 13:19:15 -0500
commitaf1fe6055c4df59dfb3a03305e677236c3067413 (patch)
tree4dcba18d46fddc094a5517903232edb82ee1ecfd /Python/random.c
parent4bb934d3701ef0a4b30b7a9764c42639b2680818 (diff)
parent7b7ecfba5681843ddfeb091d6db95843cf12a0d3 (diff)
downloadcpython-af1fe6055c4df59dfb3a03305e677236c3067413.tar.gz
merge 3.4
Diffstat (limited to 'Python/random.c')
-rw-r--r--Python/random.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/Python/random.c b/Python/random.c
index 2941ba16af..a052b65725 100644
--- a/Python/random.c
+++ b/Python/random.c
@@ -15,8 +15,6 @@ static int _Py_HashSecret_Initialized = 0;
#endif
#ifdef MS_WINDOWS
-/* This handle is never explicitly released. Instead, the operating
- system will release it when the process terminates. */
static HCRYPTPROV hCryptProv = 0;
static int
@@ -298,7 +296,12 @@ _PyRandom_Init(void)
void
_PyRandom_Fini(void)
{
-#ifndef MS_WINDOWS
+#ifdef MS_WINDOWS
+ if (hCryptProv) {
+ CryptReleaseContext(hCryptProv, 0);
+ hCryptProv = 0;
+ }
+#else
dev_urandom_close();
#endif
}