summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2015-04-10 13:22:03 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2015-04-10 13:22:03 (GMT)
commit43264b884430ebe0b899847615f9ee62734a3ed0 (patch)
treee162098ad499a5a0bd1993c020a1eea53d71591d
parent1c04a391f781f0b222be241203eb078ba467ec33 (diff)
parenta7b9a1f4df5a6bb6cf9ae7145953319a5a324dba (diff)
downloadcpython-43264b884430ebe0b899847615f9ee62734a3ed0.zip
cpython-43264b884430ebe0b899847615f9ee62734a3ed0.tar.gz
cpython-43264b884430ebe0b899847615f9ee62734a3ed0.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 c22b071..88d634e 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()