summaryrefslogtreecommitdiff
path: root/Python/random.c
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2014-10-06 17:51:53 +0200
committerGeorg Brandl <georg@python.org>2014-10-06 17:51:53 +0200
commit9d2ec0c84470eb9fdec4fe87cb223a425370e6c3 (patch)
tree3114c6929ece3426beda5e1910070133715faeff /Python/random.c
parent53230dae4fce857df51a921150058eb07deca019 (diff)
parentb825edd615e1c95f78c3dfc601af978f967618f0 (diff)
downloadcpython-9d2ec0c84470eb9fdec4fe87cb223a425370e6c3.tar.gz
merge with 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
}