diff options
author | Victor Stinner <vstinner@python.org> | 2020-04-29 18:49:00 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-29 18:49:00 +0200 |
commit | 2d8757758d0d75882fef0fe0e3c74c4756b3e81e (patch) | |
tree | 676e735cf1076bf60f2a7412e67e394e6b0f7948 /Modules/_randommodule.c | |
parent | bpo-9216: Expose OpenSSL FIPS_mode() as _hashlib.get_fips_mode() (GH-19703) (diff) | |
download | cpython-2d8757758d0d75882fef0fe0e3c74c4756b3e81e.tar.gz cpython-2d8757758d0d75882fef0fe0e3c74c4756b3e81e.tar.bz2 cpython-2d8757758d0d75882fef0fe0e3c74c4756b3e81e.zip |
bpo-40286: Remove C implementation of Random.randbytes() (GH-19797)
Remove _random.Random.randbytes(): the C implementation of
randbytes(). Implement the method in Python to ease subclassing:
randbytes() now directly reuses getrandbits().
Diffstat (limited to 'Modules/_randommodule.c')
-rw-r--r-- | Modules/_randommodule.c | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/Modules/_randommodule.c b/Modules/_randommodule.c index 0fc2d07bb50..3589173edcb 100644 --- a/Modules/_randommodule.c +++ b/Modules/_randommodule.c @@ -513,50 +513,6 @@ _random_Random_getrandbits_impl(RandomObject *self, int k) return result; } -/*[clinic input] - -_random.Random.randbytes - - self: self(type="RandomObject *") - n: Py_ssize_t - / - -Generate n random bytes. -[clinic start generated code]*/ - -static PyObject * -_random_Random_randbytes_impl(RandomObject *self, Py_ssize_t n) -/*[clinic end generated code: output=67a28548079a17ea input=7ba658a24150d233]*/ -{ - if (n < 0) { - PyErr_SetString(PyExc_ValueError, - "number of bytes must be non-negative"); - return NULL; - } - - PyObject *bytes = PyBytes_FromStringAndSize(NULL, n); - if (bytes == NULL) { - return NULL; - } - uint8_t *ptr = (uint8_t *)PyBytes_AS_STRING(bytes); - - for (; n; ptr += 4, n -= 4) { - uint32_t word = genrand_uint32(self); -#if PY_BIG_ENDIAN - /* Convert to little endian */ - word = _Py_bswap32(word); -#endif - if (n < 4) { - /* Drop least significant bits */ - memcpy(ptr, (uint8_t *)&word + (4 - n), n); - break; - } - memcpy(ptr, &word, 4); - } - - return bytes; -} - static PyObject * random_new(PyTypeObject *type, PyObject *args, PyObject *kwds) { @@ -586,7 +542,6 @@ static PyMethodDef random_methods[] = { _RANDOM_RANDOM_GETSTATE_METHODDEF _RANDOM_RANDOM_SETSTATE_METHODDEF _RANDOM_RANDOM_GETRANDBITS_METHODDEF - _RANDOM_RANDOM_RANDBYTES_METHODDEF {NULL, NULL} /* sentinel */ }; |