aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh
AgeCommit message (Collapse)Author
2013-06-10Merge remote-tracking branch 'upstream/maint'Ingela Anderton Andin
2013-06-10Merge branch 'ia/public_key/crypto/prepare-for-release' into maintIngela Anderton Andin
* ia/public_key/crypto/prepare-for-release: public_key & ssl: Add ASN-1 dependency crypto & public_key: prepare for release
2013-06-07public_key & ssl: Add ASN-1 dependencyIngela Anderton Andin
As the ASN-1 application relies on a nif in R16 for decodeing (that was not the case in R15), public_key currently has a runtime dependency on ASN-1. Hopefully we will be able to remove this dependency again in the future.
2013-06-07Merge branch 'maint'Fredrik Gustafsson
2013-06-05ssh: appup changesFredrik Gustafsson
2013-05-28Merge remote-tracking branch 'upstream/maint'Ingela Anderton Andin
Conflicts: bootstrap/lib/stdlib/ebin/beam_lib.beam lib/public_key/test/erl_make_certs.erl
2013-05-22crypto,ssh, netconf, inets: binary_to_integer -> bytes_to_integerIngela Anderton Andin
2013-05-20ssh & crypto: Remove use of deprecated crypto functions from sshIngela Anderton Andin
2013-04-22Merge branch 'hb/unicode/OTP-10907'Björn Gustavsson
* hb/unicode/OTP-10907: otp_SUITE: Add test cases to ensure that OTP conventions are obeyed Convert XML files to UTF-8 Convert XML files to UTF-8, where needed Remove the "coding: utf-8" comment from all Erlang source files Update primary bootstrap Change the default encoding of Erlang files to UTF-8
2013-04-19Convert XML files to UTF-8Hans Bolinder
2013-04-19Convert XML files to UTF-8, where neededHans Bolinder
2013-04-15ssh: unicode adaptionsFredrik Gustafsson
2013-04-05ssh: If not valid expression, rather than generate a error, try to use the cmd.Fredrik Gustafsson
2013-03-27Merge branch 'nox/ssh/fix-ssh-html-doc/OTP-10983' into maintFredrik Gustafsson
* nox/ssh/fix-ssh-html-doc/OTP-10983: Properly ignore everything in lib/ssh/doc/html/
2013-03-19Merge branch 'maint-r16' into maintAnders Svensson
2013-03-19Prepare releaseErlang/OTP
2013-03-14Removed timing rekeyingFredrik Gustafsson
2013-03-11Merge branch 'maint-r16' into maintFredrik Gustafsson
Conflicts: lib/ssh/src/ssh.appup.src lib/ssh/test/ssh_sftp_SUITE.erl
2013-03-08Merge branch 'fredrik/ssh/fix-rekeying/OTP-10911' into maint-r16Erlang/OTP
* fredrik/ssh/fix-rekeying/OTP-10911: Fixed appup for 2.1.5 Conflicts: lib/ssh/src/ssh.appup.src
2013-03-08ssh: Prepare for upcoming releaseIngela Anderton Andin
Note: If more things are added before the next releas the appup will need more updates.
2013-03-08ssh: Test and enhance handling of nonexistent subsystemIngela Anderton Andin
2013-03-08Fixed appup for 2.1.5Fredrik Gustafsson
2013-03-08Prepare releaseErlang/OTP
2013-03-08Fixed rekeying initiation and secured testcaseFredrik Gustafsson
2013-03-01ssh: Prepare for upcoming releaseIngela Anderton Andin
Note: If more things are added before the next releas the appup will need more updates.
2013-03-01ssh: Ctify test docIngela Anderton Andin
2013-03-01ssh: Test and enhance handling of nonexistent subsystemIngela Anderton Andin
2013-02-25Prepare releaseOTP_R16BErlang/OTP
2013-02-22Update copyright yearsBjörn-Egil Dahlberg
2013-02-19Fix doc for ssh:connect/3,4Martin Hässler
* Refer to ssh_connection instead of ssh_connect * Add 'seealso' tag linking to ssh_connection:session_channel
2013-02-15Versions and appup ssh, R16BFredrik Gustafsson
2013-02-15Added event/3 and clarified error messageFredrik Gustafsson
2013-02-15Error msg to be returned together with Key exchange failedFredrik Gustafsson
2013-02-15Returning the actual reason why key exchange failedFredrik Gustafsson
2013-02-14ssh: Remove derived file from gitIngela Anderton Andin
2013-02-08Properly ignore everything in lib/ssh/doc/html/Anthony Ramine
File SSH_protocols.png is versioned in both lib/ssh/doc/html/ and lib/ssh/doc/src/ whereas it should be versioned only in the latter and ignored in the former.
2013-01-29Prepare releaseOTP_R16A_RELEASE_CANDIDATEErlang/OTP
2013-01-28Merge branch 'fredrik/ssh/dialyzer-and-doc'Fredrik Gustafsson
* fredrik/ssh/dialyzer-and-doc: Fixed some broken links in ssh doc Fixed some ssh documentation
2013-01-28Fixed some broken links in ssh docFredrik Gustafsson
2013-01-28Merge branch 'ia/ssh/dialyzer-and-doc'Ingela Anderton Andin
* ia/ssh/dialyzer-and-doc: ssh: Fix dialyzer and doc warnings
2013-01-25Update copyright yearsBjörn-Egil Dahlberg
2013-01-25Fixed some ssh documentationFredrik Gustafsson
2013-01-25ssh: Fix dialyzer and doc warningsIngela Anderton Andin
2013-01-23Merge branch 'fredrik/fix-dialyzer-warn-r16'Fredrik Gustafsson
* fredrik/fix-dialyzer-warn-r16: Removed deprecated functions handle_pref_algs with correct return values
2013-01-22Fixed some specs - sshFredrik Gustafsson
2013-01-22Bumped version numbersFredrik Gustafsson
2013-01-22Removed deprecated functionsFredrik Gustafsson
2013-01-22handle_pref_algs with correct return valuesFredrik Gustafsson
2013-01-21Merge branch 'fredrik/ssh/ssh-internal-error/OTP-10731'Fredrik Gustafsson
* fredrik/ssh/ssh-internal-error/OTP-10731: Fixed internal error on when client and server can not agree o which authmethod to use
2013-01-18Fixed bug which lead to crash in startup of daemon, if port was in useFredrik Gustafsson