diff options
author | Benjamin Peterson <benjamin@python.org> | 2015-04-11 11:44:45 (GMT) |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2015-04-11 11:44:45 (GMT) |
commit | 339e3f33b6dad76b2622ffd34fc4b0083936fa24 (patch) | |
tree | ba4d1e131ae15b7555bc91f367d0916c7f1ac7f0 /Doc | |
parent | 2dbc6e6bce0a29757acddd8000d55f7c844295a2 (diff) | |
parent | 1c69c3e3d8012918473b760ba51bf93e2c4ad2f1 (diff) | |
download | cpython-339e3f33b6dad76b2622ffd34fc4b0083936fa24.zip cpython-339e3f33b6dad76b2622ffd34fc4b0083936fa24.tar.gz cpython-339e3f33b6dad76b2622ffd34fc4b0083936fa24.tar.bz2 |
merge 3.4
Diffstat (limited to 'Doc')
-rw-r--r-- | Doc/library/ssl.rst | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst index acee431..37130be 100644 --- a/Doc/library/ssl.rst +++ b/Doc/library/ssl.rst @@ -286,7 +286,7 @@ Random generation .. function:: RAND_bytes(num) - Returns *num* cryptographically strong pseudo-random bytes. Raises an + Return *num* cryptographically strong pseudo-random bytes. Raises an :class:`SSLError` if the PRNG has not been seeded with enough data or if the operation is not supported by the current RAND method. :func:`RAND_status` can be used to check the status of the PRNG and :func:`RAND_add` can be used @@ -303,7 +303,7 @@ Random generation .. function:: RAND_pseudo_bytes(num) - Returns (bytes, is_cryptographic): bytes are *num* pseudo-random bytes, + Return (bytes, is_cryptographic): bytes are *num* pseudo-random bytes, is_cryptographic is ``True`` if the bytes generated are cryptographically strong. Raises an :class:`SSLError` if the operation is not supported by the current RAND method. @@ -321,10 +321,10 @@ Random generation .. function:: RAND_status() - Returns ``True`` if the SSL pseudo-random number generator has been seeded with - 'enough' randomness, and ``False`` otherwise. You can use :func:`ssl.RAND_egd` - and :func:`ssl.RAND_add` to increase the randomness of the pseudo-random - number generator. + Return ``True`` if the SSL pseudo-random number generator has been seeded + with 'enough' randomness, and ``False`` otherwise. You can use + :func:`ssl.RAND_egd` and :func:`ssl.RAND_add` to increase the randomness of + the pseudo-random number generator. .. function:: RAND_egd(path) @@ -341,7 +341,7 @@ Random generation .. function:: RAND_add(bytes, entropy) - Mixes the given *bytes* into the SSL pseudo-random number generator. The + Mix the given *bytes* into the SSL pseudo-random number generator. The parameter *entropy* (a float) is a lower bound on the entropy contained in string (so you can always use :const:`0.0`). See :rfc:`1750` for more information on sources of entropy. |