aboutsummaryrefslogtreecommitdiffstats
path: root/lib
AgeCommit message (Collapse)Author
2016-06-13Merge branch 'joedevivo/maint/ssl/PR-1063/OTP-13635' into maint-18Erlang/OTP
* joedevivo/maint/ssl/PR-1063/OTP-13635: ssl:recv timeout() can be 0
2016-06-13Merge branch 'ingela/maint/ssl/tls-1.2-available-hashsigns/OTP-13670' into ↵Erlang/OTP
maint-18 * ingela/maint/ssl/tls-1.2-available-hashsigns/OTP-13670: ssl: ordsets:intersection/2 did not give the expected result
2016-06-13Merge branch 'kennethlakin/maint/tls-use-negotiated-prf/PR-1042/OTP-13546' ↵Erlang/OTP
into maint-18 * kennethlakin/maint/tls-use-negotiated-prf/PR-1042/OTP-13546: ssl: Use cipher suite's PRF in prf/5
2016-06-13ssl: Prepare for releaseIngela Anderton Andin
2016-06-09ssl: Use cipher suite's PRF in prf/5Kenneth Lakin
Use the negotiated cipher suite's PRF algorithm in calls to ssl:prf/5, rather than a hard-coded one. For TLS 1.0 the PRF algorithm was hard-coded to MD5/SHA1. This was correct 100% of the time. For TLS 1.1 and 1.2 the PRF algorithm was hard-coded to SHA256. This was correct only some of the time for TLS 1.2 and none of the time for TLS 1.1. Because the TLS handshake code calls tls_v1:prf/5 through another path, the handshaking process used the negotiated PRF and did not encounter this bug. A new test (prf) has been added to ssl_basic_SUITE to guard against future breakage.
2016-06-09ssl:recv timeout() can be 0Joe DeVivo
gen_tcp:recv allows this, and if you're doing something like Transport:recv(Socket, 0, 0), TCP will work and SSL will exit with function_clause There were other cases of this throughout the module. This PR cleans them all up.
2016-06-09ssl: ordsets:intersection/2 did not give the expected resultIngela Anderton Andin
Turns out we can not count on the "hashsigns" sent by the client and the supported "hashigns" sets to have required properties of ordsets.
2016-05-03Prepare releaseErlang/OTP
2016-05-03Merge branch 'ingela/inets/deprecated-inets_regexp/OTP-13533' into maint-18Erlang/OTP
* ingela/inets/deprecated-inets_regexp/OTP-13533: inets: Prepare for release inets: Put back inets_regexp module in OTP 18
2016-05-03Merge branch 'ingela/ssl/maint/algo-fixes/OTP-13525' into maint-18Erlang/OTP
* ingela/ssl/maint/algo-fixes/OTP-13525: ssl: Correct guard expression ssl: Correct cipher suites conversion
2016-05-03Merge branch 'peppe/ct_misc_18_patches' into maint-18Erlang/OTP
* peppe/ct_misc_18_patches: Add flag/option for disabling the character escaping functionality Fix bug using the wrong lists search function Fix bug with clashing timestamp values Fix problem with stylesheet tags getting escaped Skip pre/post test IO suite if cover or debug is running Tweak pre_post_io test case to run without failing Fix various log related problems
2016-05-03Merge branch 'peppe/ct_remove_nodelay/OTP-13462' into maint-18Erlang/OTP
* peppe/ct_remove_nodelay/OTP-13462: Update the reference manual Make the nodelay setting configurable and false per default
2016-05-03inets: Prepare for releaseIngela Anderton Andin
2016-05-03inets: Put back inets_regexp module in OTP 18Ingela Anderton Andin
Put back unused module inets_regexp and remove it in OTP 19 instead as it is an incompatibility, although it is an undocumented module and should not affect other applications (the world is not perfect).
2016-05-02Add flag/option for disabling the character escaping functionalityPeter Andersson
OTP-13537
2016-05-02Update the reference manualPeter Andersson
OTP-13462
2016-05-02Fix bug using the wrong lists search functionPeter Andersson
2016-05-02Fix bug with clashing timestamp valuesPeter Andersson
2016-05-02Fix problem with stylesheet tags getting escapedPeter Andersson
OTP-13536
2016-05-02Skip pre/post test IO suite if cover or debug is runningPeter Andersson
OTP-13535 The return value of ct:get_timetrap_info/0 has been modified.
2016-05-02Tweak pre_post_io test case to run without failingPeter Andersson
2016-05-02Fix various log related problemsPeter Andersson
2016-04-29ssl: Correct guard expressionIngela Anderton Andin
The guard should check that the TLS version is at least TLS-1.2.
2016-04-29ssl: Correct cipher suites conversionIngela Anderton Andin
Correct conversion errors form commit d2381e1a8d7cd54f7dc0a5105d172460b005a8fb Please enter the commit message for your changes. Lines starting
2016-04-28Make the nodelay setting configurable and false per defaultPeter Andersson
2016-04-27add testcase for the surefire hook bugZandra
2016-04-27fix cht_surefire bug when pre_init_per_suite failsZandra
When pre_init_per_suite fails before reaching the cth_surefire pre_init_per_suite unexpected XML was produced. This commit fixes that.
2016-04-26Update release notesErlang/OTP
2016-04-26Merge branch 'ingela/inets/http_server-ssl-peer-cert/OTP-13510' into maint-18Erlang/OTP
* ingela/inets/http_server-ssl-peer-cert/OTP-13510: inets: Prepare for release inets: Add peer_cert to ESI environment
2016-04-26Merge branch 'ingela/ssl/config-signature-algs/OTP-13261' into maint-18Erlang/OTP
* ingela/ssl/config-signature-algs/OTP-13261: ssl: Prepare for release ssl: Add option signature_algs
2016-04-22ssl: Corrections to cipher suite handlingIngela Anderton Andin
It was not possible to mix ssl 3 and 4 tuple cipher suites in the ciphers option. Some ssl_cipher:suite/1 clauses wrongly returned 3-tuples that should have been 4 tuples
2016-04-21inets: Prepare for releaseIngela Anderton Andin
2016-04-21inets: Add peer_cert to ESI environmentIngela Anderton Andin
2016-04-06ssl: Prepare for releaseIngela Anderton Andin
2016-04-06ssl: Add option signature_algsIngela Anderton Andin
In TLS-1.2 The signature algorithm and the hash function algorithm used to produce the digest that is used when creating the digital signature may be negotiated through the signature algorithm extension RFC 5246. We want to make these algorithm pairs configurable. In connections using lower versions of TLS these algorithms are implicit defined and can not be negotiated or configured. DTLS is updated to not cause dialyzer errors, but needs to get a real implementation later.
2016-04-01Prepare releaseErlang/OTP
2016-04-01Merge branch 'dgud/mnesia/hang-sym-trans/OTP-13423' into maint-18Erlang/OTP
* dgud/mnesia/hang-sym-trans/OTP-13423: mnesia: Send mnesia_down messages to waiting transactions
2016-03-17inets: Prepare for releaseIngela Anderton Andin
2016-03-17mnesia: Send mnesia_down messages to waiting transactionsDan Gudmundsson
Mnesia didn't forward mnesia_down to transactions which where already decided to be aborted, but that could lead to hanging transactions still waiting for messages from the node which had stopped.
2016-03-16inets: Mend ipv6_host_with_brackets optionIngela Anderton Andin
This is a quick fix to make this option work. We will revisit this and clean up httpc option handling later. Also adding regression tests.
2016-03-14Prepare releaseErlang/OTP
2016-03-10Merge branch 'siri/common_test/fix-doc-links' into maintSiri Hansen
* siri/common_test/fix-doc-links: Fix link errors in common_test documentation Document that any ssh option is allowed in ct_netconfc Conflicts: lib/common_test/doc/src/ct_hooks_chapter.xml lib/common_test/doc/src/ct_netconfc.xml
2016-03-10Merge branch 'siri/ct_netconfc/doc-allow-ssh-options/OTP-13338' into maintSiri Hansen
* siri/ct_netconfc/doc-allow-ssh-options/OTP-13338: Document that any ssh option is allowed in ct_netconfc
2016-03-10Merge branch 'siri/code_SUITE-fix' into maintSiri Hansen
* siri/code_SUITE-fix: Change '==' to '=' in code_SUITE:bad_erl_libs
2016-03-10Merge branch 'peppe/common_test/cth_improvements_docs' into maintPeter Andersson
* peppe/common_test/cth_improvements_docs: Document new CT Hook functions
2016-03-10Merge branch 'peppe/common_test/html_improvements_docs' into maintPeter Andersson
* peppe/common_test/html_improvements_docs: Document the new HTML improvements
2016-03-10Merge branch 'peppe/common_test/new_docs' into maintPeter Andersson
* peppe/common_test/new_docs: Some minor fixes Stop using edoc for the reference manual Common Test: Editorial changes 3 Common Test: Editorial changes 2 Common Test: Editorial changes 1
2016-03-10Fix link errors in common_test documentationSiri Hansen
These were introduced when converting from edoc to xml files for the common_test documentation.
2016-03-10Merge branch 'peppe/common_test/misc_18.3_bugfixes' into maintPeter Andersson
* peppe/common_test/misc_18.3_bugfixes: Fix minor issues with escaping characters OTP-13003
2016-03-10Document that any ssh option is allowed in ct_netconfcSiri Hansen
The code was changed by OTP-13338, commit bf309240cb531df880989702ae901316e8b5e97d.