aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2018-10-23 09:26:50 +0200
committerIngela Anderton Andin <[email protected]>2018-10-23 09:26:50 +0200
commit639bb57cf7d6550a48608dc827a6fd3aed1af005 (patch)
treeb9ec2d9869c1f715eeb1be187f4fb94a386030ad /erts/emulator
parent18aabe65117a7c2f9ca55bcbbfaa8847af9486ed (diff)
parentcf7d1cfdb2215bf8b35bc277d06154f83f069e47 (diff)
downloadotp-639bb57cf7d6550a48608dc827a6fd3aed1af005.tar.gz
otp-639bb57cf7d6550a48608dc827a6fd3aed1af005.tar.bz2
otp-639bb57cf7d6550a48608dc827a6fd3aed1af005.zip
Merge branch 'ingela/ssl/use-correct-len-aead' into maint
* ingela/ssl/use-correct-len-aead: ssl: Correct length to be used in additional data in CHACHA20_POLY1305 cipher
Diffstat (limited to 'erts/emulator')
0 files changed, 0 insertions, 0 deletions