aboutsummaryrefslogtreecommitdiffstats
path: root/lib
AgeCommit message (Collapse)Author
2015-12-09Merge branch 'maint'Ingela Anderton Andin
2015-12-09Merge branch 'ia/ssl-prepare-release' into maintIngela Anderton Andin
* ia/ssl-prepare-release: ssl: Correct spec ssl: Prepare for release
2015-12-08Merge branch 'egil/term_type/OTP-13172'Björn-Egil Dahlberg
* egil/term_type/OTP-13172: Test erts_internal:term_type/1 erts: Let term_type/1 encompass all types erts: Change erts_internal:map_type/1 into term_type/1
2015-12-08ssl: Correct specIngela Anderton Andin
2015-12-08ssl: Prepare for releaseIngela Anderton Andin
2015-12-08Merge branch 'maint'Hans Nilsson
2015-12-08Merge branch 'hans/ssh/defensics_errors' into maintHans Nilsson
* hans/ssh/defensics_errors: ssh: fix error for data fields errors ssh: fix error for bad packet lengths found by Defensics
2015-12-08Merge branch 'maint'Hans Nilsson
2015-12-08Merge branch 'hans/ssh/cuddle_tests' into maintHans Nilsson
* hans/ssh/cuddle_tests: ssh: add econnaborted as correct tcp disconnect reason in testcase ssh: add check for available ipv6 addr in test case ssh: Add testcase precondition
2015-12-08Merge branch 'maint'Ingela Anderton Andin
2015-12-08Merge branch 'ia/public_key/upper_bounds/OTP-13132' into maintIngela Anderton Andin
* ia/public_key/upper_bounds/OTP-13132: public_key: Add different upper bounds for diffrent string types
2015-12-08Merge branch 'maint'Dan Gudmundsson
* maint: wx: Add toolbar stretchablespace observer: Handle truncated binaries
2015-12-08Merge branch 'dgud/observer/cdv-crash-truncbin/OTP-13163' into maintDan Gudmundsson
* dgud/observer/cdv-crash-truncbin/OTP-13163: observer: Handle truncated binaries
2015-12-08Merge branch 'dgud/wx/add-toolbar-func' into maintDan Gudmundsson
* dgud/wx/add-toolbar-func: wx: Add toolbar stretchablespace
2015-12-07ssh: fix error for data fields errorsHans Nilsson
2015-12-07erts: Change erts_internal:map_type/1 into term_type/1Sverker Eriksson
to support other terms, not just maps
2015-12-07ssh: fix error for bad packet lengths found by DefensicsHans Nilsson
2015-12-07Merge branch 'maint'Henrik Nord
2015-12-07Merge branch 'rlipscombe/rl-ssl-options' into maintHenrik Nord
* rlipscombe/rl-ssl-options: Ensure single 'raw' option is handled correctly Pass 'raw' options through OTP-13166
2015-12-07Merge branch 'vladdu/jinterface_map_sortkeys' into maintHenrik Nord
* vladdu/jinterface_map_sortkeys: Improve sorting order of keys in a map
2015-12-07Merge branch 'NicoK/jinterface-regression' into maintHenrik Nord
* NicoK/jinterface-regression: jinterface: fix writing small compressed values OTP-13165
2015-12-07ssh: add econnaborted as correct tcp disconnect reason in testcaseHans Nilsson
2015-12-07ssh: add check for available ipv6 addr in test caseHans Nilsson
2015-12-07Merge branch 'maint'Ingela Anderton Andin
2015-12-07Merge branch 'ia/inets/windows-comp' into maintIngela Anderton Andin
* ia/inets/windows-comp: inets: Adjust makefile to new windows compiler
2015-12-07ssh: Add testcase preconditionHans Nilsson
2015-12-07Merge branch 'maint'Ingela Anderton Andin
2015-12-07wx: Add toolbar stretchablespaceDan Gudmundsson
Available since 3.0
2015-12-07Merge branch 'ia/ssl/sslv3-completeness' into maintIngela Anderton Andin
* ia/ssl/sslv3-completeness: ssl: SSLv3 completeness
2015-12-07ssl: SSLv3 completenessIngela Anderton Andin
We are considering removing default support for DES cipher suites. However this cipher suite is currently allowed in TLS and missing from SSL.
2015-12-07Merge branch 'maint'Björn Gustavsson
* maint: Correct rand:export_seed/0 when there is no prior seed
2015-12-07Merge branch 'bjorn/stdlib/rand-export_seed/OTP-13162' into maintBjörn Gustavsson
* bjorn/stdlib/rand-export_seed/OTP-13162: Correct rand:export_seed/0 when there is no prior seed
2015-12-07Correct rand:export_seed/0 when there is no prior seedBjörn Gustavsson
According to the documentation, rand:export_seed/0 should return 'undefined' if the seed has not been intialized. However, it will create and return a seed. That means that the following code will not work as expected: case rand:export_seed() of undefined -> rand:seen({1,2,3}); _ -> ok end, rand:uniform(Range)
2015-12-07Merge branch 'maint'Ingela Anderton Andin
2015-12-07Merge branch 'ia/ssl/max-sessions/OTP-12392' into maintIngela Anderton Andin
* ia/ssl/max-sessions/OTP-12392: ssl: Fix documentation mistakes ssl: Add upper limit for session cache ssl: Measure elapsed time with erlang:monotonic_time
2015-12-07ssl: Fix documentation mistakesIngela Anderton Andin
2015-12-07Merge branch 'maint'Hans Nilsson
* maint: ssh: tests skips if not supported crypto ssh: ssh_auth checks support for user pubkey alg ssh: client pub key opt implemented ssh: client pub key testcase ssh: client pub key documentation
2015-12-07Merge branch 'hans/ssh/pref_public_key_algs/OTP-13158' into maintHans Nilsson
* hans/ssh/pref_public_key_algs/OTP-13158: ssh: tests skips if not supported crypto ssh: ssh_auth checks support for user pubkey alg ssh: client pub key opt implemented ssh: client pub key testcase ssh: client pub key documentation
2015-12-07Merge branch 'maint'Hans Bolinder
* maint: doc: Fix some minor issues in Types and Function Specifications erts: Remove CDATA from The Abstract Format document erts: Correct the types section in The Abstract Format document stdlib: Correct pretty-printing of map types stdlib: Pretty-print constraints as 'V :: T' Conflicts: erts/doc/src/absform.xml
2015-12-07stdlib: Correct pretty-printing of map typesHans Bolinder
Add parentheses around annotated type union elements in map pair types. The bug was introduced in Erlang/OTP 18.0.
2015-12-07stdlib: Pretty-print constraints as 'V :: T'Hans Bolinder
Print constraints as 'V :: T' rather than 'is_subtype(V, T)'.
2015-12-04public_key: Add different upper bounds for diffrent string typesIngela Anderton Andin
At the bottom of the file PKIX1Explicit88.asn1 there is a commenet about upper bounds and diffrent types of strings. Adhere to this so that we can accept all certificates that openSSL does. For example: httpc:request("https://dl.sciencesocieties.org/").
2015-12-04ssh: tests skips if not supported cryptoHans Nilsson
2015-12-04ssh: ssh_auth checks support for user pubkey algHans Nilsson
2015-12-04Merge branch 'maint'Henrik Nord
2015-12-04Merge branch 'maint-17' into maintHenrik Nord
Conflicts: OTP_VERSION erts/doc/src/notes.xml erts/vsn.mk lib/kernel/doc/src/notes.xml lib/kernel/src/kernel.appup.src lib/kernel/vsn.mk lib/ssl/doc/src/notes.xml lib/ssl/src/ssl.appup.src lib/ssl/src/ssl_cipher.erl lib/ssl/vsn.mk otp_versions.table
2015-12-04observer: Handle truncated binariesDan Gudmundsson
Crashed when term was displayed
2015-12-04Merge branch 'maint'Lars Thorsen
2015-12-04Merge branch 'lars/xmllint-incorrect-errors/OTP-13026' into maintLars Thorsen
* lars/xmllint-incorrect-errors/OTP-13026: [erl_docgen] Allow br in the tag of tagged lists [erl_docgen] Add conversion of the i tag in the XSL specs [erl_docgen] Correct DTD for tags anno, fsummary and add an tag i (italic). [erl_docgen] Correct faults in the dtd Change xmllint target [erl_docgen] Update DTD for anno tag
2015-12-04Merge branch 'maint'Dan Gudmundsson
* maint: wx: Fix some function specifications wx: Remove call to disconnect_impl from server wx: Add a command queue check after event sent to erlang wx: Make wxPostScriptDC optional wx: Add wxOverlay wx: Use only one ring buffer for command queue