diff options
| author | Zandra <[email protected]> | 2015-11-20 10:02:41 +0100 |
|---|---|---|
| committer | Zandra <[email protected]> | 2015-11-20 10:02:41 +0100 |
| commit | abaa4d89bd6e012ce50f21278c9bbcfc6a553b0c (patch) | |
| tree | bba3c14ee9faf12cf5212aed8b9d58cbbc47bff4 | |
| parent | e4163490d46b89f28cc8331cf846a576e1bc12de (diff) | |
| parent | b5e4c4533ed5e407804b825ecab65164161a0060 (diff) | |
| download | otp-abaa4d89bd6e012ce50f21278c9bbcfc6a553b0c.tar.gz otp-abaa4d89bd6e012ce50f21278c9bbcfc6a553b0c.tar.bz2 otp-abaa4d89bd6e012ce50f21278c9bbcfc6a553b0c.zip | |
Merge branch 'maint'
| -rw-r--r-- | lib/crypto/doc/src/crypto.xml | 7 | ||||
| -rw-r--r-- | lib/ssh/doc/src/using_ssh.xml | 2 | ||||
| -rw-r--r-- | lib/stdlib/doc/src/rand.xml | 2 | ||||
| -rw-r--r-- | lib/stdlib/doc/src/random.xml | 2 |
4 files changed, 8 insertions, 5 deletions
diff --git a/lib/crypto/doc/src/crypto.xml b/lib/crypto/doc/src/crypto.xml index 8d082bf3fe..563a090e98 100644 --- a/lib/crypto/doc/src/crypto.xml +++ b/lib/crypto/doc/src/crypto.xml @@ -601,8 +601,11 @@ </type> <desc> <p>Generates N bytes randomly uniform 0..255, and returns the - result in a binary. Uses the <c>crypto</c> library pseudo-random - number generator.</p> + result in a binary. Uses the <c>crypto</c> library pseudo-random + number generator.</p> + <p>This function is not recommended for cryptographic purposes. + Please use <seealso marker="#strong_rand_bytes/1"> + strong_rand_bytes/1</seealso> instead.</p> </desc> </func> diff --git a/lib/ssh/doc/src/using_ssh.xml b/lib/ssh/doc/src/using_ssh.xml index 2d045fdb60..6826f20fb3 100644 --- a/lib/ssh/doc/src/using_ssh.xml +++ b/lib/ssh/doc/src/using_ssh.xml @@ -252,7 +252,7 @@ <code type="erl"> %% First three parameters depending on which crypto type we select: Key = <<"This is a 256 bit key. abcdefghi">>, -Ivec0 = crypto:rand_bytes(16), +Ivec0 = crypto:strong_rand_bytes(16), DataSize = 1024, % DataSize rem 16 = 0 for aes_cbc %% Initialization of the CryptoState, in this case it is the Ivector. diff --git a/lib/stdlib/doc/src/rand.xml b/lib/stdlib/doc/src/rand.xml index e7d4728ef7..50057259c6 100644 --- a/lib/stdlib/doc/src/rand.xml +++ b/lib/stdlib/doc/src/rand.xml @@ -104,7 +104,7 @@ strong. If a strong cryptographic random number generator is needed, use one of functions in the <seealso marker="crypto:crypto">crypto</seealso> - module, for example <c>crypto:rand_bytes/1</c>.</p></note> + module, for example <c>crypto:strong_rand_bytes/1</c>.</p></note> </description> <datatypes> <datatype> diff --git a/lib/stdlib/doc/src/random.xml b/lib/stdlib/doc/src/random.xml index d3d7c90c31..fc4f796863 100644 --- a/lib/stdlib/doc/src/random.xml +++ b/lib/stdlib/doc/src/random.xml @@ -48,7 +48,7 @@ tuple of three integers.</p> <p>It should be noted that this random number generator is not cryptographically strong. If a strong cryptographic random number generator is needed for - example <c>crypto:rand_bytes/1</c> could be used instead.</p> + example <c>crypto:strong_rand_bytes/1</c> could be used instead.</p> <note><p>The new and improved <seealso marker="stdlib:rand">rand</seealso> module should be used instead of this module.</p></note> |