diff options
author | Erlang/OTP <[email protected]> | 2015-06-01 12:06:32 +0200 |
---|---|---|
committer | Erlang/OTP <[email protected]> | 2015-06-01 12:06:32 +0200 |
commit | 27e0d318073323dc39f234607e02a56a54b2f80f (patch) | |
tree | 89aeb0c21e34ef7abe5f84d8d2b740b9b552a416 /erts | |
parent | 6ba8e4dcff857ef6933a7c91c7d85c165977a970 (diff) | |
parent | e672dc646520c7d8e4227c401fa3a60f6cbaf67b (diff) | |
download | otp-27e0d318073323dc39f234607e02a56a54b2f80f.tar.gz otp-27e0d318073323dc39f234607e02a56a54b2f80f.tar.bz2 otp-27e0d318073323dc39f234607e02a56a54b2f80f.zip |
Merge branch 'ia/ssl/crypto-bad-input/OTP-12783' into maint-17
* ia/ssl/crypto-bad-input/OTP-12783:
ssl: Prepare for release
ssl: Correct handling of bad input to premaster_secret calculation
Diffstat (limited to 'erts')
0 files changed, 0 insertions, 0 deletions