merge with 3.3

This commit is contained in:
Georg Brandl 2013-10-06 18:48:30 +02:00
commit af1edb7f45
2 changed files with 6 additions and 4 deletions

View File

@ -3377,8 +3377,9 @@ Miscellaneous Functions
This function returns random bytes from an OS-specific randomness source. The This function returns random bytes from an OS-specific randomness source. The
returned data should be unpredictable enough for cryptographic applications, returned data should be unpredictable enough for cryptographic applications,
though its exact quality depends on the OS implementation. On a Unix-like 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. system this will query ``/dev/urandom``, and on Windows it will use
If a randomness source is not found, :exc:`NotImplementedError` will be raised. ``CryptGenRandom()``. If a randomness source is not found,
:exc:`NotImplementedError` will be raised.
For an easy-to-use interface to the random number generator For an easy-to-use interface to the random number generator
provided by your platform, please see :class:`random.SystemRandom`. provided by your platform, please see :class:`random.SystemRandom`.

View File

@ -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 /* Fill buffer with size pseudo-random bytes from the operating system random
use, from the operating random number generator (RNG). 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. */ Return 0 on success, raise an exception and return -1 on error. */
int int