aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2015-10-27Merge branch 'maint'Ingela Anderton Andin
Conflicts: erts/preloaded/ebin/prim_inet.beam
2015-10-27Merge branch 'preloaded/ia/pr/758/OTP-12837' into maintIngela Anderton Andin
* preloaded/ia/pr/758/OTP-12837: erts: Include test in group so that it is run erts: Clarify documentation erts: Add {line_delimiter, byte()} option to inet:setopts/2
2015-10-26erts: Include test in group so that it is runIngela Anderton Andin
2015-10-26erts: Clarify documentationIngela Anderton Andin
2015-10-26erts: Add {line_delimiter, byte()} option to inet:setopts/2Serge Aleynikov
A new {line_delimiter, byte()} option allows line-oriented TCP-based protocols to use a custom line delimiting character. It is to be used in conjunction with {packet, line}. This option also works with erlang:decode_packet/3 when its first argument is 'line'.
2015-10-26Update primary bootstrapIngela Anderton Andin
2015-10-26Merge branch 'ia/pr/758/OTP-12837' into maintIngela Anderton Andin
* ia/pr/758/OTP-12837: erts: Include test in group so that it is run erts: Clarify documentation erts: Add {line_delimiter, byte()} option to inet:setopts/2
2015-10-26erts: Include test in group so that it is runIngela Anderton Andin
2015-10-26erts: Clarify documentationIngela Anderton Andin
2015-10-26erts: Add {line_delimiter, byte()} option to inet:setopts/2Serge Aleynikov
A new {line_delimiter, byte()} option allows line-oriented TCP-based protocols to use a custom line delimiting character. It is to be used in conjunction with {packet, line}. This option also works with erlang:decode_packet/3 when its first argument is 'line'.
2015-10-21Merge branch 'maint'Hans Nilsson
* maint: ssh: dynamic check of supported algos in ssh_to_openssh_SUITE ssh: delete now obsolete test case group 'hardening_tests'
2015-10-21Merge branch 'hans/ssh/cuddle_tests' into maintHans Nilsson
* hans/ssh/cuddle_tests: ssh: dynamic check of supported algos in ssh_to_openssh_SUITE ssh: delete now obsolete test case group 'hardening_tests'
2015-10-20ssh: dynamic check of supported algos in ssh_to_openssh_SUITEHans Nilsson
2015-10-20ssh: delete now obsolete test case group 'hardening_tests'Hans Nilsson
Thoose tests are already moved to other test suites. However, the init_per_group and end_per_group clauses were accidently left
2015-10-20Merge branch 'maint'Hans Nilsson
* maint: ssh: Removed testcases from ssh_to_openssh_SUITE ssh: test suites probes ssh client ssh: running ssh_algorithms_SUITE tests in parallel ssh: wait for subsystem exit in ssh_connection_SUITE:max_channels_option
2015-10-20Merge branch 'hans/ssh/cuddle_tests' into maintHans Nilsson
* hans/ssh/cuddle_tests: ssh: Removed testcases from ssh_to_openssh_SUITE ssh: test suites probes ssh client ssh: running ssh_algorithms_SUITE tests in parallel ssh: wait for subsystem exit in ssh_connection_SUITE:max_channels_option
2015-10-19ssh: Removed testcases from ssh_to_openssh_SUITEHans Nilsson
They are covered in ssh_algorithms_SUITE
2015-10-19ssh: test suites probes ssh clientHans Nilsson
Previously we called the ssh client with the -Q option to query about supported algorithms. Since old clients do not support this and at least one lies, we now set up a fake server at let the ssh client start negotiation instead. Much more robust hopefully.
2015-10-19ssh: running ssh_algorithms_SUITE tests in parallelHans Nilsson
2015-10-19ssh: wait for subsystem exit in ssh_connection_SUITE:max_channels_optionHans Nilsson
2015-10-19Merge branch 'maint'Hans Nilsson
* maint: ssh: Implemented ssh_transport:ecdh_validate_public_key (partly) ssh: dialyzer fix public_key: add/update -spec for ssh functions ssh, public_key: use pubkey encode/decode in app public_key ssh, public_key: Change EC Public Key representation to what was intended
2015-10-19Merge branch 'hans/ssh/cuddle_spec' into maintHans Nilsson
* hans/ssh/cuddle_spec: ssh: dialyzer fix
2015-10-19Merge branch 'hans/ssh/update_ec_pubkey' into maintHans Nilsson
* hans/ssh/update_ec_pubkey: ssh: Implemented ssh_transport:ecdh_validate_public_key (partly) public_key: add/update -spec for ssh functions ssh, public_key: use pubkey encode/decode in app public_key ssh, public_key: Change EC Public Key representation to what was intended
2015-10-19ssh: Implemented ssh_transport:ecdh_validate_public_key (partly)Hans Nilsson
Defined in http://www.secg.org/sec1-v2.pdf '3.2.2 Validation of Elliptic Curve Public Keys' according to RFC 5656 ch 4. More to be done: check singularities, implement reading compressed points....
2015-10-16ssh: dialyzer fixHans Nilsson
2015-10-16public_key: add/update -spec for ssh functionsHans Nilsson
2015-10-16ssh, public_key: use pubkey encode/decode in app public_keyHans Nilsson
2015-10-16ssh, public_key: Change EC Public Key representation to what was intendedHans Nilsson
2015-10-16Merge branch 'maint'Henrik Nord
Conflicts: OTP_VERSION
2015-10-16Merge branch 'maint-18' into maintHenrik Nord
Conflicts: lib/ssh/vsn.mk
2015-10-15Merge branch 'maint'Zandra
2015-10-15Merge branch 'kostis/hipe-bs-construct-zero-size' into maintZandra
* kostis/hipe-bs-construct-zero-size: Fix edge case of Size = 0 in bs_put_integer OTP-13048
2015-10-15Merge branch 'maint'Zandra
2015-10-15Merge branch 'appeltel/docfix_osx_install_wx_branch' into maintZandra
* appeltel/docfix_osx_install_wx_branch: Fix osx install wxWidgets instructions
2015-10-15Updated OTP versionOTP-18.1.3Erlang/OTP
2015-10-15Update release notesErlang/OTP
2015-10-15Merge branch 'hans/ssh/include_gex_group1/OTP-13046' into maint-18Erlang/OTP
* hans/ssh/include_gex_group1/OTP-13046: ssh: set dh_gex default to group14 ssh: Add a 1024 group to the list of key gex groups
2015-10-15ssh: set dh_gex default to group14Hans Nilsson
2015-10-15ssh: Add a 1024 group to the list of key gex groupsHans Nilsson
2015-10-15Merge branch 'bjorn/remove-webtool/OTP-13004'Björn Gustavsson
* bjorn/remove-webtool/OTP-13004: Remove the deprecated webtool application
2015-10-14Remove the deprecated webtool applicationBjörn Gustavsson
2015-10-14Merge branch 'maint'Henrik Nord
Conflicts: OTP_VERSION
2015-10-14Merge branch 'maint-18' into maintHenrik Nord
Conflicts: lib/ssh/vsn.mk
2015-10-13Merge branch 'maint'Hans Nilsson
2015-10-13Merge branch 'hans/ssh/cuddle_tests' into maintHans Nilsson
2015-10-13Merge branch 'hans/ssh/cuddle_spec' into maintHans Nilsson
2015-10-13Updated OTP versionOTP-18.1.2Erlang/OTP
2015-10-13Update release notesErlang/OTP
2015-10-13Merge branch 'hans/ssh/option_max_channels/OTP-13036' into maint-18Erlang/OTP
* hans/ssh/option_max_channels/OTP-13036: ssh: update vsn.mk ssh: Option max_channels added.
2015-10-13Merge branch 'maint'Henrik Nord