summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2015-04-10 13:21:58 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2015-04-10 13:21:58 (GMT)
commit0fa23e4a36a0a92d42e4d1e1b86e584b1455bc46 (patch)
treec88f7b44324730d0e6e2f81682e1378960864653
parent6a7728612956f112a1e826fddc511a306597e703 (diff)
parenteb7a97c48e34dd3b68a8b2db5839699d43642ec4 (diff)
downloadcpython-0fa23e4a36a0a92d42e4d1e1b86e584b1455bc46.zip
cpython-0fa23e4a36a0a92d42e4d1e1b86e584b1455bc46.tar.gz
cpython-0fa23e4a36a0a92d42e4d1e1b86e584b1455bc46.tar.bz2
Merge heads
-rw-r--r--Doc/library/ssl.rst4
1 files changed, 4 insertions, 0 deletions
diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst
index 465bf8f..141dcb2 100644
--- a/Doc/library/ssl.rst
+++ b/Doc/library/ssl.rst
@@ -292,6 +292,8 @@ Random generation
can be used to check the status of the PRNG and :func:`RAND_add` can be used
to seed the PRNG.
+ For almost all applications :func:`os.urandom` is preferable.
+
Read the Wikipedia article, `Cryptographically secure pseudorandom number
generator (CSPRNG)
<http://en.wikipedia.org/wiki/Cryptographically_secure_pseudorandom_number_generator>`_,
@@ -311,6 +313,8 @@ Random generation
for non-cryptographic purposes and for certain purposes in cryptographic
protocols, but usually not for key generation etc.
+ For almost all applications :func:`os.urandom` is preferable.
+
.. versionadded:: 3.3
.. function:: RAND_status()