aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2019-03-18 11:39:40 +0100
committerHans Nilsson <[email protected]>2019-03-18 11:39:40 +0100
commit63820aafb93f82584fb4528e6c9d05952ffd31e2 (patch)
treefd431f0e50b0d918ead6c606af18b28e6249418c /erts/emulator
parent2d661f8272addcec37b0a8205d614cb398df530b (diff)
parent98e5f741c8305b9549b236c4f2583343cc422d7e (diff)
downloadotp-63820aafb93f82584fb4528e6c9d05952ffd31e2.tar.gz
otp-63820aafb93f82584fb4528e6c9d05952ffd31e2.tar.bz2
otp-63820aafb93f82584fb4528e6c9d05952ffd31e2.zip
Merge branch 'hans/crypto/fix_chacha20_bug/OTP-15678'
* hans/crypto/fix_chacha20_bug/OTP-15678: crypto: Disable chacha20 if OpenSSL 1.1.0-1.1.0c
Diffstat (limited to 'erts/emulator')
0 files changed, 0 insertions, 0 deletions