aboutsummaryrefslogtreecommitdiffstats
path: root/erts/vsn.mk
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2017-02-01 18:32:33 +0100
committerErlang/OTP <[email protected]>2017-02-01 18:32:33 +0100
commitc25ee54a0ba1a875a714f9f3e52071846c655982 (patch)
tree903de6b13057897af77db039f30bd90f734480f3 /erts/vsn.mk
parentcd545daf6a88ebebef6de1fb631cb47e91b05ca5 (diff)
parent62f9bd09023da0b318e57b6454bd4b346816a27b (diff)
downloadotp-c25ee54a0ba1a875a714f9f3e52071846c655982.tar.gz
otp-c25ee54a0ba1a875a714f9f3e52071846c655982.tar.bz2
otp-c25ee54a0ba1a875a714f9f3e52071846c655982.zip
Merge branch 'hans/ssh/dh_group_exc_optimize/OTP-14169' into maint-18
* hans/ssh/dh_group_exc_optimize/OTP-14169: ssh: optimize kex dh_gex using new crypto functionality crypto: Added optional length to paramlist in generate_key ssh,crypto: prepare for release # Conflicts: # lib/ssh/src/ssh_transport.erl
Diffstat (limited to 'erts/vsn.mk')
0 files changed, 0 insertions, 0 deletions