aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/src/ssh.erl
AgeCommit message (Collapse)Author
2016-05-02Merge branch 'hans/ssh/daemon_port_0/OTP-13527'Hans Nilsson
Conflicts: lib/ssh/test/ssh_test_lib.erl
2016-04-28ssh: make ssh:daemon choose port when Port=0 in the argumentsHans Nilsson
2016-04-27ssh: Idle-timer refactoring and some cosmetics and inlineingHans Nilsson
2016-04-27ssh: Begin -spec for ssh_connection_handlerHans Nilsson
2016-03-15update copyright-yearHenrik Nord
2015-12-03ssh: client pub key opt implementedHans Nilsson
2015-12-01Support SSH key callback module optionsVipin Nair
This patch allows extra callback options to be passed to the module implementing the SSH callback module behaviour. A module implementing the SSH key callback API is used to customize the handling of public key. This patch allows extra callback options to be passed to the module implementing the SSH callback module behaviour. The key_cb option has been changed: {key_cb, atom()} -> {key_cb, key_cb()} Where: key_cb() :: atom() | {atom(), list()} The callback options, if specified, is made available to the callback module via the options passed to it under the key 'key_cb_private'. More details and some backgorund is available here[1]. [1]: http://erlang.org/pipermail/erlang-patches/2015-November/004800.html
2015-11-19ssh: Make it possible for more than one daemon started with option fdHans Nilsson
2015-11-06Merge branch 'hans/ssh/pwdfun/OTP-13055' into maintHans Nilsson
* hans/ssh/pwdfun/OTP-13055: ssh: changes after doc review ssh: Document pwdfun ssh: make corrections of keyboard-interactive client ssh: enable users to give option keyboard_interact_fun ssh: pwdfun/4 and simple tests Conflicts: lib/ssh/doc/src/ssh.xml
2015-11-04ssh: extend 'dh_gex_limits' to server sideHans Nilsson
OTP-13066
2015-11-04ssh: option dh_gex_groups with tag ssh_moduli_fileHans Nilsson
Makes this existing option also accept a file in openssh format OTP-13052
2015-11-04ssh, public_key: random selection of diffie-hellman moduliHans Nilsson
Also tool (public_key:gen_moduli_hrl) to convert an openssh moduli file to erlang format.
2015-11-04ssh: enable users to give option keyboard_interact_funHans Nilsson
It is on purpose not documented. It needs more thinking before being finalized.
2015-11-04ssh: pwdfun/4 and simple testsHans Nilsson
Also solves OTP-13053
2015-10-16ssh: dialyzer fixHans Nilsson
2015-10-14Merge branch 'maint-18' into maintHenrik Nord
Conflicts: lib/ssh/vsn.mk
2015-10-12ssh: updatated spec for ssh:daemonHans Nilsson
2015-10-08ssh: Option max_channels added.Hans Nilsson
It actually counts the number of subsystem alive. Allocating a channel does not consume any resources (except some cpu cycles), but the subsystem start spawns processes.
2015-08-25ssh: add extra random length padding in packetsHans Nilsson
A new experimental option 'max_random_length_padding', not documented so it might change...
2015-08-05ssh: more dh_gex test casesHans Nilsson
2015-08-05ssh: options 'dh_gex_groups' and 'dh_gex_limits'Hans Nilsson
2015-06-18Change license text to APLv2Bruce Yinhe
2015-06-09ssh: Option unexpectedfun for ssh:daemon and ssh:connectHans Nilsson
This option has a fun as value. The fun will be called when an unexpected message arrives. The fun returns either 'skip' or 'report' to guide the connection_handler what to do. One usage is to filter out messages that are not wanted in the error logger as info reports. An example of such a message is the 'etimedout' tcp error message that will be received if a connection has keep_alive and the peer is restarted.
2015-06-08Merge branch 'ia/ssh/name-spaces/OTP-12675'Ingela Anderton Andin
* ia/ssh/name-spaces/OTP-12675: ssh: Correct Makefile ssh: Add profile option
2015-06-05ssh: Check that user_dir and system_dir exists and are readableHans
2015-06-03ssh: Add profile optionIngela Anderton Andin
To enable the ssh daemon to run in a virtualized environment, where there can be more that one server that has the same ip-address and port, we add a new option profile. The profile name will be used in concatenation with ip-address and port to identify the ssh daemon instance. The name profile was chosen as there is a similar concept in the HTTP client in inets where profile names can be used to instantiate client configurations. Also the same type of option has been added to the HTTP server in inets.
2015-06-02correct merge conflictHenrik Nord
2015-06-02Merge branch 'maint'Henrik Nord
Conflicts: OTP_VERSION lib/inets/test/httpd_SUITE.erl lib/inets/vsn.mk lib/ssh/src/ssh.erl lib/ssh/vsn.mk lib/ssl/src/ssl.appup.src lib/ssl/vsn.mk
2015-05-29ssh: Implement keyboard_interactive on server sideHans
2015-05-26ssh: Undocumented option 'compression' replaced by 'preferred_algorithms'Hans Nilsson
The 'compression' option was used in the test cases. The new option 'preferred_algorithms' is much more powerful and can be used as a replacement.
2015-05-26ssh: New option 'preferred_algorithms'Hans Nilsson
This option enables the user to define which algorithms that are to be used as well as their precedences in the negotiation between server and client.
2015-05-26ssh: Remove erroneous option 'role'Hans Nilsson
This option is set internaly but there is no reason to set it when calling a function.
2015-05-13ssh: option for handling the SSH_MSG_DEBUG message's printoutsHans Nilsson
A fun could be given in the options that will be called whenever the SSH_MSG_DEBUG message arrives. This enables the user to format the printout or just discard it. The default is changed to not print the message. In RFC4253 printing is a SHOULD, but our new default is to protect logs from dos attacs.
2015-04-21ssh: added id_string option for server and clientHans Nilsson
For limiting Banner Grabbing attempts.
2015-04-07ssh: Option minimal_remote_max_packet_size and test casesHans Nilsson
2014-10-22ssh: Add pty_alloc request to ssh:shell/[1,2,3]Ingela Anderton Andin
2014-09-25ssh: Adjust supervisor tree to make sure new listningIngela Anderton Andin
options are honored
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-06-12Fix spelling mistakesMarcus Arendt
2014-06-11ssh: Handle inet and inet6 option correctlyIngela Anderton Andin
2014-05-09ssh: Use correct timeout value for the connection timeoutIngela Anderton Andin
2014-04-24ssh: Add max_session parameter to ssh:daemonHans Nilsson
2014-03-26ssh: added daemon option 'parallel_login', default falseHans Nilsson
2014-03-26ssh: Added option negotiation_timeout for ssh:daemonHans Nilsson
This option is for closing a connection where the client connects, but then do nothing except keeping server resources.
2014-02-14Merge branch 'weisslj/ssh-spec-doc-fixes'Henrik Nord
* weisslj/ssh-spec-doc-fixes: ssh: Fix dialyzer type specs and documentation OTP-11705
2014-01-28Fix incorrect proplists type referenceTuncer Ayaz
ssh and public_key were referring to proplists:proplists/0 which does not exist. Fix by using the correct type proplists:proplist/0.
2014-01-27ssh: Fix dialyzer type specs and documentationJohannes Weißl
Similar to d9ebfb8. The wrong specs were leading to dialyzer warnings like this in our application since R16B03: The pattern 'ok' can never match the type {'error',_}. The pattern {'error', {'already_started', 'ssh'}} can never match the type 'ok'. The pattern {'error', _} can never match the type {'open_error',_,string(),string()}.
2013-11-13ssh: Add option to disallow CLIIngela Anderton Andin
OTP-10976
2013-11-13ssh: Simplify handling of connection attributes (e.i. user and sockname)Ingela Anderton Andin
OTP-11296
2013-11-13ssh: Make inet option configurable and remove ipv6_disabled optionIngela Anderton Andin