diff options
author | Hans Nilsson <[email protected]> | 2015-08-30 11:21:35 +0200 |
---|---|---|
committer | Hans Nilsson <[email protected]> | 2015-08-30 11:21:35 +0200 |
commit | bd698a302da6f4ca0940add26852c32dc27d3d07 (patch) | |
tree | 420a1429d471c9bd246e4f60afb9e46a47207384 /lib/ssh/src/ssh_transport.hrl | |
parent | 8fac1e6b35b62321d98655866e8f76400c6d0cbf (diff) | |
parent | ee71e0e20819e2ab9e251f4bb46e8b0b19f2a1b3 (diff) | |
download | otp-bd698a302da6f4ca0940add26852c32dc27d3d07.tar.gz otp-bd698a302da6f4ca0940add26852c32dc27d3d07.tar.bz2 otp-bd698a302da6f4ca0940add26852c32dc27d3d07.zip |
Merge branch 'maint'
* maint:
ssh: Reorganize and extend the test suites
Diffstat (limited to 'lib/ssh/src/ssh_transport.hrl')
-rw-r--r-- | lib/ssh/src/ssh_transport.hrl | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/lib/ssh/src/ssh_transport.hrl b/lib/ssh/src/ssh_transport.hrl index e6449e93c5..0bc6b7953b 100644 --- a/lib/ssh/src/ssh_transport.hrl +++ b/lib/ssh/src/ssh_transport.hrl @@ -30,6 +30,13 @@ -define(DEFAULT_CLIENT_VERSION, {2, 0}). -define(DEFAULT_SERVER_VERSION, {2, 0}). +-define(MAX_NUM_ALGORITHMS, 100). + +-define(DEFAULT_DH_GROUP_MIN, 512). +-define(DEFAULT_DH_GROUP_NBITS, 1024). +-define(DEFAULT_DH_GROUP_MAX, 4096). + + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% %% BASIC transport messages @@ -132,10 +139,6 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% diffie-hellman-group-exchange-sha1 | diffie-hellman-group-exchange-sha256 --define(DEFAULT_DH_GROUP_MIN, 512). --define(DEFAULT_DH_GROUP_NBITS, 1024). --define(DEFAULT_DH_GROUP_MAX, 4096). - -define(SSH_MSG_KEX_DH_GEX_REQUEST_OLD, 30). -define(SSH_MSG_KEX_DH_GEX_REQUEST, 34). -define(SSH_MSG_KEX_DH_GEX_GROUP, 31). |