diff options
| author | Ingela Anderton Andin <[email protected]> | 2016-04-25 11:44:07 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2016-04-25 11:44:07 +0200 |
| commit | 5f67ca5b3d0c13dfbe936fcfa08621eef00d53cf (patch) | |
| tree | 40ed1c7ace8863dcd3662d2390b1e9195fa848cd /lib/ssl/src/ssl.erl | |
| parent | 79f3e0ef07eff9d22fb1735d77813142da493bfc (diff) | |
| parent | 09bd54f2d28cb2981028f55dc93279a98021e8d1 (diff) | |
| download | otp-5f67ca5b3d0c13dfbe936fcfa08621eef00d53cf.tar.gz otp-5f67ca5b3d0c13dfbe936fcfa08621eef00d53cf.tar.bz2 otp-5f67ca5b3d0c13dfbe936fcfa08621eef00d53cf.zip | |
Merge branch 'ingela/otp/deprecated-rand_bytes/OTP-13214'
* ingela/otp/deprecated-rand_bytes/OTP-13214:
stdlib: Remove use of crypto:rand_bytes/1
compiler: Remove use of crypto:rand_bytes/1
ssh: Remove use of crypto:rand_bytes/1
public_key: Remove use of crypto:rand_bytes/1
ssl: Remove use of crypto:rand_bytes/1
crypto: Deprecate rand_bytes/1
Diffstat (limited to 'lib/ssl/src/ssl.erl')
| -rw-r--r-- | lib/ssl/src/ssl.erl | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl index 4bcd6ddb0e..61afdce93c 100644 --- a/lib/ssl/src/ssl.erl +++ b/lib/ssl/src/ssl.erl @@ -42,7 +42,7 @@ renegotiate/1, prf/5, negotiated_protocol/1, negotiated_next_protocol/1, connection_information/1, connection_information/2]). %% Misc --export([random_bytes/1, handle_options/2]). +-export([handle_options/2]). -deprecated({negotiated_next_protocol, 1, next_major_release}). -deprecated({connection_info, 1, next_major_release}). @@ -581,22 +581,6 @@ format_error(Error) -> Other end. -%%-------------------------------------------------------------------- --spec random_bytes(integer()) -> binary(). - -%% -%% Description: Generates cryptographically secure random sequence if possible -%% fallbacks on pseudo random function -%%-------------------------------------------------------------------- -random_bytes(N) -> - try crypto:strong_rand_bytes(N) of - RandBytes -> - RandBytes - catch - error:low_entropy -> - crypto:rand_bytes(N) - end. - %%%-------------------------------------------------------------- %%% Internal functions %%%-------------------------------------------------------------------- |