aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2016-09-07Merge branch 'ingela/ssl/ssl_basic_SUITE-timeouts' into maintIngela Anderton Andin
* ingela/ssl/ssl_basic_SUITE-timeouts: ssl: Tune timeout ssl: Consistent timeout handling
2016-09-07ssl: Tune timeoutIngela Anderton Andin
2016-09-07ssl: Consistent timeout handlingIngela Anderton Andin
init_per_testcase timeout for renegotiation tests would be overridden by local timeout in test case help function.
2016-09-06Bump inets versionRaimo Niskanen
2016-09-06Merge branch 'ingela/ssl/dtls-progress/connection-states-as-maps' into maintIngela Anderton Andin
* ingela/ssl/dtls-progress/connection-states-as-maps: dtls: fix encoding of client hello cookie dtls: Prepare start of DTLS connection manager with SSL app ssl: Refactor to use maps for the connection states ssl, dtls: Refactor sni handling dtls: Add close/5 dtls: Add renegotiate/2 dtls: Add protocol event handling ssl: Refactor code so that tls and dtls can share more code ssl, dtls: Disable V2 compatibility clause from ssl_handshake:update_handshake_history ssl: Make sure common code for TLS and DTLS uses the TLS Version ssl: remove unused RecordCB argument from master_secret dtls: Add reinit_handshake_data/1 to dtls dtls: replace tls_record with RecordCB in connection_info Fix version numbers and dependencies
2016-09-06Merge branch 'sverker/beam-too-few-functions/ERL-244/OTP-13848' into maintSverker Eriksson
* sverker/beam-too-few-functions/ERL-244: erts: Reject beam file with too few functions
2016-09-06Merge branch 'hans/ssh/keyboard_interactive_defensics' into maintHans Nilsson
2016-09-06Merge branch 'hans/ssh/strengthen_pubkey/OTP-13847' into maintHans Nilsson
Conflicts: lib/ssh/src/ssh_auth.erl
2016-09-06Merge branch 'hans/ssh/correct_sha_ecdsa/OTP-13850' into maintHans Nilsson
2016-09-06Merge branch 'hans/ssh/channel_no_detect_close/OTP-13859' into maintHans Nilsson
2016-09-06Merge branch 'hasse/doc/format_man_pages_utf8' into maintHans Bolinder
* hasse/doc/format_man_pages_utf8: doc: Use groff with -Tutf8
2016-09-06Merge branch 'rickard/thr-prgr-unmanaged-delay-bug/OTP-13869' into maintRickard Green
* rickard/thr-prgr-unmanaged-delay-bug/OTP-13869: Fix erts_thr_progress_unmanaged_delay()
2016-09-06Merge branch 'rickard/drv-send-term-thr-bug/OTP-13866' into maintRickard Green
* rickard/drv-send-term-thr-bug/OTP-13866: Fix thread calls to erl_drv_send_term()/erl_drv_output_term() Conflicts: erts/emulator/beam/io.c
2016-09-06doc: Use groff with -Tutf8Hans Bolinder
2016-09-06Merge branch 'ingela/ssl/ssl_to_openssl_SUITE' into maintIngela Anderton Andin
* ingela/ssl/ssl_to_openssl_SUITE: ssl: Make sure to have correct default
2016-09-06Merge branch 'lukas/ts/no_flush_on_halt' into maintLukas Larsson
* lukas/ts/no_flush_on_halt: ts: Don't flush port when ending test run
2016-09-06Merge branch 'hasse/kernel/doc-fix' into maintHans Bolinder
* hasse/kernel/doc-fix: kernel: Correct file(3)
2016-09-06kernel: Correct file(3)Hans Bolinder
2016-09-05Fix erts_thr_progress_unmanaged_delay()Rickard Green
Thread progress leader update did not cache current unmanaged index when waiting for unmanaged threads. This caused erts_thr_progress_unmanaged_delay() to stop working until a new leader took over.
2016-09-05Merge branch 'lukas/erts/epmd_xmllint_fix' into maintLukas Larsson
* lukas/erts/epmd_xmllint_fix: epmd: Fix xmllint error in comsummary
2016-09-05Merge branch 'lukas/erts/fix_signalhandler_errno_restore/OTP-13868' into maintLukas Larsson
* lukas/erts/fix_signalhandler_errno_restore/OTP-13868: erts: Fix child setup signal hander bug
2016-09-05Merge branch 'lukas/kernel/os_cmd_fix_stdin_close/OTP-13867' into maintLukas Larsson
* lukas/kernel/os_cmd_fix_stdin_close/OTP-13867: kernel: Close stdin of commands run in os:cmd
2016-09-05Merge branch 'lukas/kernel/fix_os_SUITE_message_leak_testcase/OTP-13867' ↵Lukas Larsson
into maint * lukas/kernel/fix_os_SUITE_message_leak_testcase/OTP-13867: kernerl: Remove infinite loop from testcase
2016-09-05Merge branch 'lukas/erts/tracing/fix_sparc_align_issue/OTP-13803' into maintLukas Larsson
* lukas/erts/tracing/fix_sparc_align_issue/OTP-13803: erts: Immed tracer states also have to be alignable
2016-09-05Fix thread calls to erl_drv_send_term()/erl_drv_output_term()Rickard Green
2016-09-05erts: Reject beam file with too few functionsSverker Eriksson
2016-09-05dtls: fix encoding of client hello cookieAndreas Schultz
2016-09-05dtls: Prepare start of DTLS connection manager with SSL appAndreas Schultz
2016-09-05ssl: Refactor to use maps for the connection statesIngela Anderton Andin
2016-09-05ssl, dtls: Refactor sni handlingIngela Anderton Andin
2016-09-05dtls: Add close/5Ingela Anderton Andin
2016-09-05dtls: Add renegotiate/2Ingela Anderton Andin
2016-09-05dtls: Add protocol event handlingIngela Anderton Andin
2016-09-05ssl: Refactor code so that tls and dtls can share more codeIngela Anderton Andin
We want to share more alert and application data handling code. Some of the application data handling code, packet handling, will not be relevant for dtls, but this code can be excluded from dtls by options checking.
2016-09-05ssl, dtls: Disable V2 compatibility clause from ↵Ingela Anderton Andin
ssl_handshake:update_handshake_history This proably a much bigger problem for DTLS than TLS, but should be disabled for both unless explicitly configured for TLS.
2016-09-05ssl: Make sure common code for TLS and DTLS uses the TLS VersionIngela Anderton Andin
When protocol version is proagated from the DTLS connection processes state into general ssl functions it must be converted to the corresponding TLS version.
2016-09-05ssl: remove unused RecordCB argument from master_secretAndreas Schultz
Conflicts: lib/ssl/src/ssl_handshake.erl
2016-09-05dtls: Add reinit_handshake_data/1 to dtlsIngela Anderton Andin
The callback is invoke before entering state 'connection'. It allows a connection module to remove data from the connection state that is no longer needed (e.g. handshake history).
2016-09-05dtls: replace tls_record with RecordCB in connection_infoAndreas Schultz
Conflicts: lib/ssl/src/ssl_connection.erl
2016-09-05Fix version numbers and dependenciesRaimo Niskanen
2016-09-05ssl: Make sure to have correct defaultIngela Anderton Andin
2016-09-05Merge branch 'ingela/ssl/test-framework-checks' into maintIngela Anderton Andin
* ingela/ssl/test-framework-checks: ssl: Test ssl v2 clients rejection depending on configuration ssl: Add check in test framework for crypto support
2016-09-05ssh: add tstflg value one_empty to force daemon send empty ↵Hans Nilsson
ssh_msg_userauth_info_request This behavour is assumed by Codenomicon Defensics.
2016-09-02kernel: Close stdin of commands run in os:cmdLukas Larsson
This is needed when running programs that only exit when stdin has been closed, e.g. 'more'.
2016-09-02ssl: Test ssl v2 clients rejection depending on configurationIngela Anderton Andin
Even though v2 is never supported v2 hellos can be. No support for v2 client hellos gives "handshake failiure" alert. Support for v2 hello but no higher SSL/TLS version offered gives "protocol version" alert.
2016-09-02Merge branch 'rickard/new-purge-strategy/OTP-13777' into maintRickard Green
* rickard/new-purge-strategy/OTP-13777: Introduce literal sweep of native stack in new purge strategy
2016-09-02Introduce literal sweep of native stack in new purge strategyRickard Green
2016-09-02ssh: pre-verify keyHans Nilsson
Conflicts: lib/ssh/src/ssh_auth.erl
2016-09-02Merge branch 'sverker/hipe-sparc-19/PR-1148/OTP-13861' into maintSverker Eriksson
* sverker/hipe-sparc-19/PR-1148: Eliminate catch-all clause from two functions Increase the time limit used by the test suite
2016-09-02ssl: Add check in test framework for crypto supportIngela Anderton Andin
Avoid to run tests of algorithms not supported by crypto.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-04 18:12:50 +0000