aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2014-06-04 10:34:53 +0200
committerIngela Anderton Andin <[email protected]>2014-06-04 10:34:53 +0200
commit6fd795f56297141507e06254a495a06f40c88521 (patch)
treeb01dd4ad0d88cc5d8857005d98065dcc43403f53 /erts
parenta4dac83e01f7f74ccad5ee1f81bdb12808e2d9e0 (diff)
parent3e82b3663a5be56acefb4a18a08f01976fbbb73e (diff)
downloadotp-6fd795f56297141507e06254a495a06f40c88521.tar.gz
otp-6fd795f56297141507e06254a495a06f40c88521.tar.bz2
otp-6fd795f56297141507e06254a495a06f40c88521.zip
Merge branch 'ia/ssl/default-ciphers/OTP-11966' into maint
* ia/ssl/default-ciphers/OTP-11966: ssl: Workaround that gen_fsm does not call CB:format_status when CB:terminate crashes. SSL: always filter the full list of supported ciphers against the supported algorithms ssl: Filter default ciphers for supported Crypto algorihms
Diffstat (limited to 'erts')
0 files changed, 0 insertions, 0 deletions