diff options
| author | Ingela Anderton Andin <[email protected]> | 2013-11-14 10:34:37 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2013-11-14 10:34:37 +0100 |
| commit | f03339650039e4da871df142bd52f65f7aa586c1 (patch) | |
| tree | 491a91dd4a267762d3407293fb1f40f404b676e0 /lib/ssh/src/ssh.hrl | |
| parent | ae7ae7d734b980294073ea43923167904349347c (diff) | |
| parent | 19aedb5c0cb956e51b24fbba4923520efe7bf54b (diff) | |
| download | otp-f03339650039e4da871df142bd52f65f7aa586c1.tar.gz otp-f03339650039e4da871df142bd52f65f7aa586c1.tar.bz2 otp-f03339650039e4da871df142bd52f65f7aa586c1.zip | |
Merge remote-tracking branch 'upstream/maint'
Diffstat (limited to 'lib/ssh/src/ssh.hrl')
| -rw-r--r-- | lib/ssh/src/ssh.hrl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/ssh/src/ssh.hrl b/lib/ssh/src/ssh.hrl index 4fd347ba8f..94ced9da6f 100644 --- a/lib/ssh/src/ssh.hrl +++ b/lib/ssh/src/ssh.hrl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2004-2012. All Rights Reserved. +%% Copyright Ericsson AB 2004-2013. 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 @@ -29,6 +29,8 @@ -define(SSH_DEFAULT_PORT, 22). -define(SSH_MAX_PACKET_SIZE, (256*1024)). -define(SSH_LENGHT_INDICATOR_SIZE, 4). +-define(REKEY_TIMOUT, 3600000). +-define(REKEY_DATA_TIMOUT, 60000). -define(FALSE, 0). -define(TRUE, 1). |