diff options
| author | Erlang/OTP <[email protected]> | 2017-02-01 18:32:33 +0100 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2017-02-01 18:32:33 +0100 |
| commit | c25ee54a0ba1a875a714f9f3e52071846c655982 (patch) | |
| tree | 903de6b13057897af77db039f30bd90f734480f3 /lib/ssh/src/ssh.app.src | |
| parent | cd545daf6a88ebebef6de1fb631cb47e91b05ca5 (diff) | |
| parent | 62f9bd09023da0b318e57b6454bd4b346816a27b (diff) | |
| download | otp-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 'lib/ssh/src/ssh.app.src')
| -rw-r--r-- | lib/ssh/src/ssh.app.src | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssh/src/ssh.app.src b/lib/ssh/src/ssh.app.src index 4a76fd9cd3..cb0f087cfb 100644 --- a/lib/ssh/src/ssh.app.src +++ b/lib/ssh/src/ssh.app.src @@ -40,6 +40,6 @@ {env, []}, {mod, {ssh_app, []}}, {runtime_dependencies, ["stdlib-2.3","public_key-0.22","kernel-3.0", - "erts-6.0","crypto-3.3"]}]}. + "erts-6.0","crypto-3.6.3.1"]}]}. |