From baf692feaf7fca5fe407b4d0133981b6245759c2 Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Tue, 21 Feb 2012 16:08:05 -0500 Subject: enable hash randomization by default --- Python/random.c | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'Python/random.c') diff --git a/Python/random.c b/Python/random.c index a2ae002261..7019a3503e 100644 --- a/Python/random.c +++ b/Python/random.c @@ -256,17 +256,6 @@ _PyRandom_Init(void) return; _Py_HashSecret_Initialized = 1; - /* - By default, hash randomization is disabled, and only - enabled if PYTHONHASHSEED is set to non-empty or if - "-R" is provided at the command line: - */ - if (!Py_HashRandomizationFlag) { - /* Disable the randomized hash: */ - memset(secret, 0, secret_size); - return; - } - /* Hash randomization is enabled. Generate a per-process secret, using PYTHONHASHSEED if provided. -- cgit v1.2.1 From 423082c23e8357508fa8ff1b1184c675c27206f8 Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Fri, 7 Sep 2012 23:49:07 +0200 Subject: Issue #15340: Fix importing the random module when /dev/urandom cannot be opened. This was a regression caused by the hash randomization patch. --- Python/random.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Python/random.c') diff --git a/Python/random.c b/Python/random.c index 7019a3503e..53518c2ebe 100644 --- a/Python/random.c +++ b/Python/random.c @@ -165,7 +165,8 @@ dev_urandom_python(char *buffer, Py_ssize_t size) Py_END_ALLOW_THREADS if (fd < 0) { - PyErr_SetFromErrnoWithFilename(PyExc_OSError, "/dev/urandom"); + PyErr_SetString(PyExc_NotImplementedError, + "/dev/urandom (or equivalent) not found"); return -1; } -- cgit v1.2.1