aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/src
AgeCommit message (Collapse)Author
2014-11-12Merge branch 'dotsimon/ssh_connect_timeout/OTP-12306' into maintMarcus Arendt
* dotsimon/ssh_connect_timeout/OTP-12306: Fix ssh_sftp:start_channel timeout
2014-11-04Merge branch 'ia/ssh/rekeying-typo/OTP-12277' into maintIngela Anderton Andin
* ia/ssh/rekeying-typo/OTP-12277: ssh: Correct typo of renegotiate that could cause rekeying to fail
2014-10-30Merge branch 'ia/ssh/pty-request/OTP-11542' into maintIngela Anderton Andin
* ia/ssh/pty-request/OTP-11542: ssh: Add basic ptty_alloc tests ssh: Add pty_alloc request to ssh:shell/[1,2,3] ssh: Add ptty_alloc/[2,3]
2014-10-30ssh: Correct typo of renegotiate that could cause rekeying to failIngela Anderton Andin
2014-10-24Fix ssh_sftp:start_channel timeoutSimon Cornish
The {timeout, Timeout} option passed to ssh_sftp:start_channel is not applied to the early phases of the SSH protocol. For example, if the remote server fails to respond after the "hello" then the call will hang for as long as the server keeps the TCP connection alive. This patch passes the Timeout through to ssh:connect. In case the timeout occurs during these phases, {error, timeout} is returned.
2014-10-23Merge branch 'maint-17' into maintHenrik Nord
Conflicts: OTP_VERSION
2014-10-23ssh: fix ssh.appup.src.Hans Nilsson
2014-10-23ssh: Corrected appupIngela Anderton Andin
2014-10-22ssh: fix .app and .appup errorsHans Nilsson
2014-10-22ssh: remove supervisors for crashed connection workerHans Nilsson
2014-10-22ssh: Print supervisor tree (on demand).Hans Nilsson
2014-10-22ssh: Add pty_alloc request to ssh:shell/[1,2,3]Ingela Anderton Andin
2014-10-22ssh: Add ptty_alloc/[2,3]Ingela Anderton Andin
2014-10-21ssh: avoid terminated but not deleted children to be counted.Hans Nilsson
2014-10-21ssh: simple info function (ssh_info:print/0).Hans Nilsson
2014-10-17ssh: Gracefully handle bad handshake messagesIngela Anderton Andin
2014-10-17ssh: reduce amount of printoutsHans Nilsson
2014-10-16ssh: Fix port scanner problemsHans Nilsson
2014-10-16ssh: Fixes clause syntax error in ssh.appup.srcHans Nilsson
2014-10-15Merge branch 'maint-17' into maintBruce Yinhe
Conflicts: OTP_VERSION
2014-10-13ssh: Prepare for releaseIngela Anderton Andin
2014-10-10ssh: Add option sftp_vsnIngela Anderton Andin
2014-10-09ssh: Fix option user_interaction to work as expectedIngela Anderton Andin
When password authentication is implemented with ssh keyboard-interactive method and the password is already supplied, so that we do not need to query the user, connections should succeed even though the user_interaction option is set to false.
2014-10-09ssh: Corrected ret val from ssh_connection:subsystem/4.Hans Nilsson
2014-09-30Merge branch 'maint-17' into maintHenrik Nord
Conflicts: OTP_VERSION lib/ssh/test/ssh_connection_SUITE.erl
2014-09-29Merge branch 'ia/ssh/version-appup' into maint-17Erlang/OTP
* ia/ssh/version-appup: ssh: ssh-3.0.6 will not support soft ugrade
2014-09-29Merge branch 'ia/ssh/listner-restart/OTP-12168' into maint-17Erlang/OTP
* ia/ssh/listner-restart/OTP-12168: ssh: Adjust supervisor tree to make sure new listning options are honored ssh: Add test case for ssh:stop_listner
2014-09-29Merge branch 'ia/ssh/version-handling-gracefull/OTP-12157' into maint-17Erlang/OTP
* 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
2014-09-26Merge branch 'matwey/makefile' into maintBruce Yinhe
OTP-12200 * matwey/makefile: Cleanup parse_transform modules in eunit Cleanup behaviour modules in ssl Cleanup behaviour modules in ssh Fix a typo in clean section of otp_mibs makefile
2014-09-25ssh: Adjust supervisor tree to make sure new listningIngela Anderton Andin
options are honored
2014-09-25ssh: Fixed parallel_login bug that made all logins serialHans Nilsson
2014-09-24ssh: Add format_status/2 so sensitive data will not be present in logsIngela Anderton Andin
2014-09-24ssh: Gracefully handle incorrect versionsIngela Anderton Andin
Conflicts: lib/ssh/test/ssh_connection_SUITE.erl
2014-09-22ssh: ssh-3.0.6 will not support soft ugradeIngela Anderton Andin
Customer requesting patch will not use soft upgrade and as it will be hard to meet customer deadline and assure quality of soft upgrade we decided to make it an application restart.
2014-09-03Merge branch 'arekinath/ssh/aes-ctr' into maintMarcus Arendt
* arekinath/ssh/aes-ctr: ssh: check if ssh client supports newer cipher- and MAC-algorithms SSH: only enable ciphers/MACs when they are available in crypto SSH: add ssh_to_openssh test for ciphers and macs SSH: documentation update for new algos SSH: add support for aes128-ctr and hmac-sha2-256
2014-08-28Merge branch 'michaelkschmidt/ssh_bug_fix' into maintMarcus Arendt
* michaelkschmidt/ssh_bug_fix: Test Other Clauses of start_shell Fix SSH CLI when using custom "shell" option
2014-08-28SSH: only enable ciphers/MACs when they are available in cryptoAlex Wilson
Also adjusts tests to only expect a positive outcome when crypto supports the relevant base ciphers/MACs.
2014-08-22Test Other Clauses of start_shellMichael K. Schmidt
start_shell() is called by exec, so test those cases as well. Also add support for passing a fun to exec.
2014-08-11ssh: negotiation_timeout bug fixedHans Nilsson
2014-07-23Fix SSH CLI when using custom "shell" optionMichael K. Schmidt
Also address compatibility issue with PuTTY
2014-07-02Cleanup behaviour modules in sshMatwey V. Kornilov
Behaviour modules were not cleanuped.
2014-06-16ssh: Minor message encode/decode bugfixesHans Nilsson
SSH_MSG_IGNORE SSH_MSG_UNIMPLEMENTED
2014-06-16ssh: Prepare for releaseHans Nilsson
2014-06-16ssh: Accept disconnect msgs without language tagHans Nilsson
2014-06-12Fix spelling mistakesMarcus Arendt
2014-06-11ssh: Handle inet and inet6 option correctlyIngela Anderton Andin
2014-06-10SSH: add support for aes128-ctr and hmac-sha2-256Alex Wilson
This cipher and hmac are RECOMMENDED as per RFC4344 and RFC6668. RFC4344 notes that aes128-ctr is likely to be promoted to REQUIRED in the near future. Some distros of Linux and Illumos are already shipping with aes128-cbc and 3des-cbc disabled by default due to security concerns around chosen-plaintext attacks and other information leaks. Without this patch, OTP SSH cannot connect to these SSH servers in their default configuration.
2014-05-27Merge branch 'maint-17' into maintIngela Anderton Andin
Conflicts: OTP_VERSION lib/ssh/test/ssh_basic_SUITE.erl lib/ssh/vsn.mk
2014-05-26ssh: Prepare for releaseHans Nilsson
2014-05-26ssh: Use correct timeout value for the connection timeoutIngela Anderton Andin