diff options
author | Erlang/OTP <[email protected]> | 2014-09-29 08:59:48 +0200 |
---|---|---|
committer | Erlang/OTP <[email protected]> | 2014-09-29 08:59:48 +0200 |
commit | ee4af1e0736f0ae1661fecd63c05c24c4067e4ea (patch) | |
tree | 9b39aa16f506fa58022ea8f943cc7c01de0fa541 /lib/ssh/src/ssh_connect.hrl | |
parent | 6f565f2e5db3afc29c1dea9f00bc2126e2758b9f (diff) | |
parent | 0fba2ec56dd3557a6ef74a211581dce9827be1a6 (diff) | |
download | otp-ee4af1e0736f0ae1661fecd63c05c24c4067e4ea.tar.gz otp-ee4af1e0736f0ae1661fecd63c05c24c4067e4ea.tar.bz2 otp-ee4af1e0736f0ae1661fecd63c05c24c4067e4ea.zip |
Merge branch 'ia/ssh/version-handling-gracefull/OTP-12157' into maint-17
* ia/ssh/version-handling-gracefull/OTP-12157:
ssh: Add format_status/2 so sensitive data will not be present in logs
ssh: Gracefully handle incorrect versions
Diffstat (limited to 'lib/ssh/src/ssh_connect.hrl')
-rw-r--r-- | lib/ssh/src/ssh_connect.hrl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/ssh/src/ssh_connect.hrl b/lib/ssh/src/ssh_connect.hrl index 8421b07167..9307dbbad0 100644 --- a/lib/ssh/src/ssh_connect.hrl +++ b/lib/ssh/src/ssh_connect.hrl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2005-2013. All Rights Reserved. +%% Copyright Ericsson AB 2005-2014. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -26,6 +26,7 @@ -define(DEFAULT_PACKET_SIZE, 32768). -define(DEFAULT_WINDOW_SIZE, 2*?DEFAULT_PACKET_SIZE). -define(DEFAULT_TIMEOUT, 5000). +-define(MAX_PROTO_VERSION, 255). %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% |