aboutsummaryrefslogtreecommitdiffstats
path: root/lib
AgeCommit message (Collapse)Author
2016-11-02Add ECC curve selection order config in TLS serverFred Hebert
As per RFC 4492 Sec 5.1, the preferred order of selection of named curves is based on client preferences. Currently, the SSL application only picks entries according to the absolute order of entries as tracked in a hardcoded list in code. This patch changes things so that the client-specified order is preferred. It also allows a mode where the server can be configured to override the client's preferred order with its own, although the chosen ECC must still be within both lists. The configuration is done through the following options: - `eccs`, shared by clients and servers alike, allows the specification of the supported named curves, in their preferred order, and may eventually support more values for explicit primes and so on. - `honor_ecc_order`, a server-only option, is similar to `honor_cipher_order` and will, by default let the server pick the client-preferred ECC, and otherwise pick the server-preferred one. The default value for `eccs` is the same as before, although the server-chosen ECC now defaults to the client rather than previous choice. A function `ssl:eccs()` has been added that returns the highest supported ECCs for the library.
2016-10-19Merge branch 'gomoripeti/stdlib/ms_fix/PR-1203/OTP-13974' into maintHans Bolinder
* gomoripeti/stdlib/ms_fix/PR-1203/OTP-13974: dbg:fun2ms: allow empty list as head
2016-10-19Merge branch 'raimo/gen_statem-improvements/OTP-13929' into maintRaimo Niskanen
* raimo/gen_statem-improvements/OTP-13929: Fix race condition in cancel_timer/1 Use parameterized types Implement state timeouts Improve docs and types Change state entry events into state enter calls Improve docs Improve docs Implement state entry events Implement call/3 dirty_timeout
2016-10-18Merge branch 'hans/inets/ftp_multiline_resp/PR-1196/OTP-13960' into maintHans Nilsson
2016-10-18Merge branch 'hans/inets/ftp_locks/OTP-13967' into maintHans Nilsson
2016-10-18Merge branch 'maint-19' into maintHans Nilsson
2016-10-17Prepare releaseErlang/OTP
2016-10-17ssh: fix renegotiation problemHans Nilsson
2016-10-17ssh: test case for renegotiation with openssh clientHans Nilsson
2016-10-17Merge branch 'egil/erl_docgen/reformat-docgen-encoding/OTP-13971' into maintBjörn-Egil Dahlberg
* egil/erl_docgen/reformat-docgen-encoding/OTP-13971: Reformat docgen xml encoding
2016-10-14ssl: Tune timeout for old solaris machineIngela Anderton Andin
2016-10-14ftp: New DBG alternative: ct:palHans Nilsson
2016-10-14ftp: added forgotten inet:setopts active onceHans Nilsson
2016-10-14ftp: socket wrapper changed suddenly and erroneouslyHans Nilsson
2016-10-14Merge branch 'maint-19' into maintHans Nilsson
2016-10-14Fix race condition in cancel_timer/1Raimo Niskanen
2016-10-13dbg:fun2ms: allow empty list as headPéter Gömöri
Running 'dbg:fun2ms(fun([]) -> return_trace() end' resulted in an error "dbg:fun2ms requires fun with single variable or list parameter" But the empty list is actually a list and it is a valid value as a match-spec head (matching on arity-0 functions). Although its practical use is questionable this commit eliminates a small limitation of ms_transform which is not present in the match-spec grammar.
2016-10-13Prepare releaseErlang/OTP
2016-10-13ssh: Removed matching of 'ok' after send which could cause error reportsHans Nilsson
2016-10-13ssh: ssh_protocol_SUITE test for handling of illegal info_linesHans Nilsson
2016-10-13ssh: property test case for illegal infoline and closeHans Nilsson
This tests an illegal client that sends an info line and closes 'immediatly'.
2016-10-13Use parameterized typesRaimo Niskanen
2016-10-13Merge branch 'hasse/dialyzer/fix_opaque_bugs/OTP-13693' into maintHans Bolinder
* hasse/dialyzer/fix_opaque_bugs/OTP-13693: dialyzer: Fix opaque bug dialyzer: Fix opaque bugs
2016-10-12Merge branch 'xsipewe/dialyzer/doc_cleanup' into maintHans Bolinder
* xsipewe/dialyzer/doc_cleanup: Update Dialyzer documentation
2016-10-12Implement state timeoutsRaimo Niskanen
2016-10-11Reformat docgen xml encodingBjörn-Egil Dahlberg
epp:default_encoding/0 returns 'utf8' and needs to be re-encoded to "UTF-8" to be correct.
2016-10-11Merge remote-tracking branch 'github/pr/1199' into maintIngela Anderton Andin
* github/pr/1199: Correct a typo in mod_esi documentation
2016-10-11Merge branch 'ingela/ssl/algo-check/OTP-13959' into maintIngela Anderton Andin
* ingela/ssl/algo-check/OTP-13959: Properly filter ssl cipher suites reported as supported
2016-10-11Merge branch 'ingela/ssl/crl_SUITE' into maintIngela Anderton Andin
* ingela/ssl/crl_SUITE: ssl: Make sure test has correct input
2016-10-11Merge branch 'maint-19' into maintHans Nilsson
2016-10-11Update Dialyzer documentationxsipewe
Language cleaned up by the technical writer xsipewe from Combitech. Proofreading and corrections by Hans Bolinder.
2016-10-10Correct a typo in mod_esi documentationWill
2016-10-10Prepare releaseErlang/OTP
2016-10-10Revert "ssh: Add non-blocking send" since it introduces Error ReportsHans Nilsson
This reverts commit 28baf1314b556bb592c24181f6967e1f324f44a7.
2016-10-10Merge branch 'sverker/load_nif-print-init-error/OTP-13951' into maintSverker Eriksson
* sverker/load_nif-print-init-error: crypto: Return source line number from failed load/upgrade erts: Print error code from failed NIF load/upgrade/reload
2016-10-10Properly filter ssl cipher suites reported as supportedDániel Szoboszlay
Adapted from commit 675ee6860d2c273bcc6c6a0536634a107e2a3d9f. Conflicts: lib/ssl/src/ssl_cipher.erl
2016-10-07Merge branch 'bjorn/compiler/beam_bsm/ERL-268/OTP-13947' into maintBjörn Gustavsson
* bjorn/compiler/beam_bsm/ERL-268/OTP-13947: beam_bsm: Eliminate unsafe optimization
2016-10-07Merge branch 'ingela/inets/httpc/ERL-253' into maintIngela Anderton Andin
* ingela/inets/httpc/ERL-253: inets: httpc improve error handling
2016-10-07Merge branch 'kostis/inets-reference-record-types/PR-1188' into maintIngela Anderton Andin
* kostis/inets-reference-record-types/PR-1188: Replace ref() with reference() in inets files
2016-10-07Merge branch 'ingela/ssl/cipher-type-spec' into maintIngela Anderton Andin
* ingela/ssl/cipher-type-spec: ssl: Adjust cipher type to conform to implementation
2016-10-07Merge branch 'dgud/wx/fix-unicode-chardata/ERL-270/OTP-13934' into maintDan Gudmundsson
* dgud/wx/fix-unicode-chardata/ERL-270/OTP-13934: Fix guard test for chardata
2016-10-07Merge branch 'dgud/mnesia/dirty_select_cont/PR-1184/OTP-13944' into maintDan Gudmundsson
* dgud/mnesia/dirty_select_cont/PR-1184/OTP-13944: Allow reusing mnesia select continuations
2016-10-07Merge branch 'dgud/tools/emacs/edoc-support/PR-1195/OTP-13945' into maintDan Gudmundsson
* dgud/tools/emacs/edoc-support/PR-1195/OTP-13945: New file erlang-edoc.el to support EDoc in erlang-mode
2016-10-06Fix inets ftp bug related to multiple lines respJohan Sommerfeld
Fixes a bug that makes the ftp client end up in bad state if there is a multi line response from the server and the response number is in the message being sent.
2016-10-06dialyzer: Fix opaque bugHans Bolinder
The "decoration" of opaque types works better than before when opaque types are used by other opaque types.
2016-10-06dialyzer: Fix opaque bugsHans Bolinder
t_from_form() sometimes returned a more general type than it should have done due to a bug in from_form_loop(): it stopped when the limit was exceeded, which could mean a collapsed type. Returning a type with smaller depth should fix this. is_specialization() now handles opaque types before unions, which should fix another problem. The bugs reported by Kostis.
2016-10-06New file erlang-edoc.el to support EDoc in erlang-modeLeo Liu
- EDoc markup font-locking and tag completion - EDoc comment indentation
2016-10-06Merge branch 'maint-19' into maintIngela Anderton Andin
2016-10-06Update release notesErlang/OTP
2016-10-06Allow reusing mnesia select continuationsDániel Szoboszlay
A continuation returned by mnesia:select/[14] should be reusable in different, non-transactional activities. Aborting with wrong_transaction doesn't make sense in a dirty context.