merge with 3.3

birkenfeld · birkenfeld · commit af1edb7f457c · 2013-10-06T18:48:30.000+02:00
diff --git a/Doc/library/os.rst b/Doc/library/os.rst
@@ -3377,8 +3377,9 @@ Miscellaneous Functions
    This function returns random bytes from an OS-specific randomness source.  The
    returned data should be unpredictable enough for cryptographic applications,
    though its exact quality depends on the OS implementation.  On a Unix-like
-   system this will query /dev/urandom, and on Windows it will use CryptGenRandom.
-   If a randomness source is not found, :exc:`NotImplementedError` will be raised.
+   system this will query ``/dev/urandom``, and on Windows it will use
+   ``CryptGenRandom()``.  If a randomness source is not found,
+   :exc:`NotImplementedError` will be raised.
 
    For an easy-to-use interface to the random number generator
    provided by your platform, please see :class:`random.SystemRandom`.
diff --git a/Python/random.c b/Python/random.c
@@ -218,8 +218,9 @@ lcg_urandom(unsigned int x0, unsigned char *buffer, size_t size)
     }
 }
 
-/* Fill buffer with size pseudo-random bytes, not suitable for cryptographic
-   use, from the operating random number generator (RNG).
+/* Fill buffer with size pseudo-random bytes from the operating system random
+   number generator (RNG). It is suitable for for most cryptographic purposes
+   except long living private keys for asymmetric encryption.
 
    Return 0 on success, raise an exception and return -1 on error. */
 int

Original file line number	Diff line number	Diff line change
`@@ -218,8 +218,9 @@ lcg_urandom(unsigned int x0, unsigned char *buffer, size_t size)`
`218`	`218`	`}`
`219`	`219`	`}`
`220`	`220`
`221`		`-/* Fill buffer with size pseudo-random bytes, not suitable for cryptographic`
`222`		`- use, from the operating random number generator (RNG).`
	`221`	`+/* Fill buffer with size pseudo-random bytes from the operating system random`
	`222`	`+ number generator (RNG). It is suitable for for most cryptographic purposes`
	`223`	`+ except long living private keys for asymmetric encryption.`
`223`	`224`
`224`	`225`	`Return 0 on success, raise an exception and return -1 on error. */`
`225`	`226`	`int`