diff options
| author | Hans Nilsson <[email protected]> | 2017-04-28 12:03:58 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2017-04-28 12:03:58 +0200 |
| commit | 3b9e917b6abf803eaa95ab66c5cb4fe31b7270cd (patch) | |
| tree | 7910f4935fb8bfc271ee210be066a2b2a917bbab /lib/ssh/src/ssh.hrl | |
| parent | 86f6a985670008690695b304c6606b054d2f27c3 (diff) | |
| parent | 6f26467274a77d0838596775f3e7e6a33aad7273 (diff) | |
| download | otp-3b9e917b6abf803eaa95ab66c5cb4fe31b7270cd.tar.gz otp-3b9e917b6abf803eaa95ab66c5cb4fe31b7270cd.tar.bz2 otp-3b9e917b6abf803eaa95ab66c5cb4fe31b7270cd.zip | |
Merge branch 'hans/ssh/draft-ietf-curdle-ssh-ext-info/OTP-14193'
Diffstat (limited to 'lib/ssh/src/ssh.hrl')
| -rw-r--r-- | lib/ssh/src/ssh.hrl | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/lib/ssh/src/ssh.hrl b/lib/ssh/src/ssh.hrl index 315310f700..cf2a359e6c 100644 --- a/lib/ssh/src/ssh.hrl +++ b/lib/ssh/src/ssh.hrl @@ -38,7 +38,6 @@ -define(MAX_RND_PADDING_LEN, 15). -define(SUPPORTED_AUTH_METHODS, "publickey,keyboard-interactive,password"). --define(SUPPORTED_USER_KEYS, ['ssh-rsa','ssh-dss','ecdsa-sha2-nistp256','ecdsa-sha2-nistp384','ecdsa-sha2-nistp521']). -define(FALSE, 0). -define(TRUE, 1). @@ -134,7 +133,7 @@ role :: client | role(), peer :: undefined | {inet:hostname(), - {inet:ip_adress(),inet:port_number()}}, %% string version of peer address + {inet:ip_address(),inet:port_number()}}, %% string version of peer address c_vsn, %% client version {Major,Minor} s_vsn, %% server version {Major,Minor} @@ -145,6 +144,9 @@ c_keyinit, %% binary payload of kexinit packet s_keyinit, %% binary payload of kexinit packet + send_ext_info, %% May send ext-info to peer + recv_ext_info, %% Expect ext-info from peer + algorithms, %% #alg{} kex, %% key exchange algorithm @@ -198,6 +200,7 @@ userauth_quiet_mode, % boolean() userauth_methods, % list( string() ) eg ["keyboard-interactive", "password"] userauth_supported_methods, % string() eg "keyboard-interactive,password" + userauth_pubkeys, kb_tries_left = 0, % integer(), num tries left for "keyboard-interactive" userauth_preference, available_host_keys, @@ -216,7 +219,9 @@ compress, decompress, c_lng, - s_lng + s_lng, + send_ext_info, + recv_ext_info }). -record(ssh_key, |