aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2015-09-14 17:03:37 +0200
committerHans Nilsson <[email protected]>2015-09-14 17:03:37 +0200
commit44a53a37f39e65c935ed2648ec74dc0f741611e1 (patch)
tree27a6efd1ecc9637e24583e05d7188464aeda5c94
parent7e0e50bafef2b0855eba3f0111e6e141025ebf13 (diff)
parente889cb0381be081891c530bbf04c72797042455b (diff)
downloadotp-44a53a37f39e65c935ed2648ec74dc0f741611e1.tar.gz
otp-44a53a37f39e65c935ed2648ec74dc0f741611e1.tar.bz2
otp-44a53a37f39e65c935ed2648ec74dc0f741611e1.zip
Merge branch 'hans/ssh/increase_max_num_algos' into maint
-rw-r--r--lib/ssh/src/ssh_transport.hrl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssh/src/ssh_transport.hrl b/lib/ssh/src/ssh_transport.hrl
index d962b1111f..96ab1bb668 100644
--- a/lib/ssh/src/ssh_transport.hrl
+++ b/lib/ssh/src/ssh_transport.hrl
@@ -30,7 +30,7 @@
-define(DEFAULT_CLIENT_VERSION, {2, 0}).
-define(DEFAULT_SERVER_VERSION, {2, 0}).
--define(MAX_NUM_ALGORITHMS, 100).
+-define(MAX_NUM_ALGORITHMS, 200).
-define(DEFAULT_DH_GROUP_MIN, 1024).
-define(DEFAULT_DH_GROUP_NBITS, 6144).