aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh
AgeCommit message (Collapse)Author
2017-02-20Merge branch 'maint'Hans Nilsson
2017-02-17Merge branch 'ssh_sftpd_relative_path' into hans/ssh/sftpd_fixes/OTP-14225Hans Nilsson
Conflicts: lib/ssh/test/ssh_sftpd_SUITE.erl
2017-02-17Merge branch 'ssh_sftpd_cwd_with_root' into hans/ssh/sftpd_fixes/OTP-14225Hans Nilsson
Conflicts: lib/ssh/test/ssh_sftpd_SUITE.erl
2017-02-17Merge branch 'hans/ssh/try_sftp_access_outside_root' into ↵Hans Nilsson
hans/ssh/sftpd_fixes/OTP-14225
2017-02-16Merge branch 'maint'Hans Nilsson
2017-02-16Merge branch 'hans/ssh/ssh_acceptor_bug/OTP-14108' into maintHans Nilsson
2017-02-16Merge branch 'maint'Hans Nilsson
2017-02-15ssh: handle return values and exceptions from ssh_acceptor:handle_connectionHans Nilsson
2017-02-15ssh: More exact test for is_tcp_socketHans Nilsson
2017-02-15ssh: Add error case for bad socketHans Nilsson
2017-02-15ssh: speling errorHans Nilsson
2017-02-15ssh: speling errorHans Nilsson
2017-02-15ssh: reword documentationHans Nilsson
2017-02-15Merge branch 'fix-source-typos'Björn Gustavsson
* fix-source-typos: (25 commits) Fixed typos in system/doc Fixed typos in lib/xmerl Fixed typos in lib/wx Fixed typos in lib/stdlib Fixed typos in lib/snmp Fixed typos in lib/ssl Fixed typos in lib/ssh Fixed typos in PKCS-8.asn1 file Fixed typos in lib/parsetools Fixed typos in lib/orber Fixed typos in lib/mnesia Fixed typos in lib/megaco Fixed typos in lib/kernel Fixed typos in lib/jinterface Fixed typos in lib/inets Fixed typos in lib/hipe Fixed typos in lib/eunit Fixed typos in lib/erl_interface Fixed typos in lib/eldap Fixed typos in lib/edoc ...
2017-02-15Return correct state in the case of failureKarolis Petrauskas
2017-02-14ssh: allow a list of fingerprint algos in silently_accept_hosts optionHans Nilsson
2017-02-14Merge branch 'maint'Hans Nilsson
2017-02-14ssh: new test - try access outside sftp treeHans Nilsson
2017-02-14Fixed typos in lib/sshAndrew Dryga
2017-02-12Check for directory with correct pathKarolis Petrauskas
When opening file in the ssh_sftpd, directory check should be performed on the server's file tree.
2017-02-12Fix relative path handling in sftpdKarolis Petrauskas
Relative path handling fixed to allow opening a file by a path relative to the current working directory.
2017-02-12Consider root_dir and cwd in ssh_sftpd, if both are providedKarolis Petrauskas
The SFTPD server should use root_dir and cwd when resolving file paths, if both are provided. The root directory should be used for resolving absolute file names, and cwd should be used for resolving relative paths.
2017-02-08ssh: modify ssh_algorithms_SUITE:init_per_suite for some Windows hangningHans Nilsson
2017-02-07Merge branch 'hans/ssh/default_algo_list/OTP-14110'Hans Nilsson
2017-02-06Merge branch 'maint'Hans Nilsson
2017-02-06Revert "ssh: removed 'ssh-dss' from default list"Hans Nilsson
This reverts commit 6847d9223420fb86cdf72f0e608a5f41a2673053. The removal of ssh-dss seems to give a too high risk of failing customer systems. Needs to be properly deprecated.
2017-02-03ssh: use real groups in kex_gex test suiteHans Nilsson
2017-02-03ssh: logging in test lib for ssh testsHans Nilsson
2017-02-03Merge branch 'hans/ssh/default_algo_list/OTP-14110'Hans Nilsson
2017-02-03erge branch 'maint'Hans Nilsson
Conflicts: OTP_VERSION
2017-02-03Merge branch 'maint-18' into maintHans Nilsson
Conflicts: OTP_VERSION erts/doc/src/notes.xml erts/emulator/sys/unix/erl_unix_sys.h erts/emulator/sys/unix/sys.c erts/vsn.mk lib/crypto/c_src/crypto.c lib/crypto/doc/src/notes.xml lib/crypto/vsn.mk lib/inets/doc/src/notes.xml lib/inets/vsn.mk lib/ssh/doc/src/notes.xml lib/ssh/src/ssh.app.src lib/ssh/src/ssh_connection_handler.erl lib/ssh/vsn.mk otp_versions.table
2017-02-02ssh: document new and retired algorithmsHans Nilsson
2017-02-02Merge branch 'hans/ssh/default_algo_list/OTP-14110'Hans Nilsson
2017-02-02Merge branch 'maint'Hans Nilsson
2017-02-01Prepare releaseErlang/OTP
2017-02-01ssh: Enable usage of supported but not default host key algorithmsHans Nilsson
2017-02-01ssh: minor code unfoldingHans Nilsson
2017-02-01ssh: clearer hash calculationHans Nilsson
2017-02-01ssh: update tests for removed algorithmsHans Nilsson
2017-02-01ssh: remove test timetrap for ssh_kex_group_exchangeHans Nilsson
This kex algorithm is now optimized so a long timetrap is not needed
2017-01-31ssh: optimize kex dh_gex using new crypto functionalityHans Nilsson
Conflicts: lib/ssh/src/ssh_connection_handler.erl lib/ssh/src/ssh_transport.erl
2017-01-31ssh,crypto: prepare for releaseHans Nilsson
2017-01-31ssh: better error msg at kex failureHans Nilsson
2017-01-31ssh: removed 'ssh-dss' from default listHans Nilsson
Reason: insecure
2017-01-31ssh: removed 'diffie-hellman-group1-sha1' from default listHans Nilsson
Reason: very insecure
2017-01-31ssh: added stronger diffie-hellman groupsHans Nilsson
diffie-hellman-group16-sha512 diffie-hellman-group18-sha512 diffie-hellman-group14-sha256
2017-01-31ssh: reordered default algorithms listHans Nilsson
2017-01-31Merge branch 'maint'Hans Nilsson
Conflicts: lib/crypto/c_src/crypto.c lib/crypto/src/crypto.erl
2017-01-31Merge branch 'hans/ssh/speed_dh_keygen/OTP-14169' into maintHans Nilsson
2017-01-30ssh: increase timetrap for ssh_benchmark_SUITEHans Nilsson