aboutsummaryrefslogtreecommitdiffstats
path: root/lib
AgeCommit message (Collapse)Author
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 '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 '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-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 '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-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 '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 '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 '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-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-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 '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 'dgud/wx/rewrite-cmd-loop/OTP-13160' into maintDan Gudmundsson
* dgud/wx/rewrite-cmd-loop/OTP-13160: 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
2015-12-04Merge branch 'bjorn/stdlib/fix-erl_lint-bugs/OTP-13157' into maintBjörn Gustavsson
* bjorn/stdlib/fix-erl_lint-bugs/OTP-13157: Extend erl_lint:format_error/1 to handle bittype mismatches erl_lint_SUITE: Add smoke test of format_error/1
2015-12-04Merge branch 'zandra/rm-eunit-assertReceive' into maintZandra
* zandra/rm-eunit-assertReceive: rm assertReceive, due to a leftover of a conflict resolution
2015-12-03Improve sorting order of keys in a mapVlad Dumitrescu
The implementation sorted keys differently for different Java versions (probably due to different hashing algorithms), so we switch it to use LinkedHashMap where the order is deterministic.
2015-12-03ssh: client pub key opt implementedHans Nilsson
2015-12-03ssh: client pub key testcaseHans Nilsson
2015-12-03ssh: client pub key documentationHans Nilsson
2015-12-03wx: Fix some function specificationsDan Gudmundsson
2015-12-03ssl: Add upper limit for session cacheIngela Anderton Andin
If upper limit is reached invalidate the current cache entries, e.i the session lifetime is the max time a session will be keept, but it may be invalidated earlier if the max limit for the table is reached. This will keep the ssl manager process well behaved, not exhusting memeory. Invalidating the entries will incrementally empty the cache to make room for fresh sessions entries.
2015-12-03ssl: Measure elapsed time with erlang:monotonic_timeIngela Anderton Andin
2015-12-03Extend erl_lint:format_error/1 to handle bittype mismatchesBjörn Gustavsson
erl_lint:format_error/1 would crash with a function error if conflicting types were given. That was most easily noticed in the shell: Eshell V7.0.3 (abort with ^G) 1> <<0/integer-binary>>. *** ERROR: Shell process terminated! *** Noticed-by: Aleksei Magusev
2015-12-03erl_lint_SUITE: Add smoke test of format_error/1Björn Gustavsson
The test suite depended on the compiler to call erl_lint:format_error/1 to ensure that format_error/1 was covered. Unfortunately, though, if format_error/1 crashed the compiler would catch the exception so that the test suite would not notice it. Add a smoke test of format_error/1 that will crash if there is any problem with erl_lint:format_error/1.
2015-12-03Merge branch 'bjorn/asn1/empty-named-bit-string/OTP-13149' into maintBjörn Gustavsson
* bjorn/asn1/empty-named-bit-string/OTP-13149: BER: Fix encoding of empty named BIT STRING
2015-12-03Prepare releaseErlang/OTP
2015-12-03Merge branch 'ia/ssl/maint-17/backport-of-18-fix' into maint-17Erlang/OTP
* ia/ssl/maint-17/backport-of-18-fix: ssl: Prepare for release ssl: Do not crash on proprietary hash_sign algorithms
2015-12-03ssl: Prepare for releaseIngela Anderton Andin
2015-12-03Merge branch 'siri/ct_netconfc/log-silent/OTP-13035' into maintSiri Hansen
* siri/ct_netconfc/log-silent/OTP-13035: Don't attempt logging when log type is 'silent'
2015-12-03rm assertReceive, due to a leftover of a conflict resolutionZandra
c574bd33c39d91c487c3fcd819226ecfc46c13c8
2015-12-03Merge branch 'swvist/topic/ssh-key-callback-options' into maintZandra
* swvist/topic/ssh-key-callback-options: Support SSH key callback module options OTP-13156
2015-12-02Merge branch 'soranoba/fix-file-position/PR-646' into maintRaimo Niskanen
* soranoba/fix-file-position/PR-646: Unify internal error handling Fix file:pread and :pwrite to use character encoding Clean up code for file:position/2 Fix file:position (not raw mode) OTP-13155
2015-12-02Merge branch 'siri/ct_netconfc/clear-timer/OTP-13008' into maintSiri Hansen
* siri/ct_netconfc/clear-timer/OTP-13008: Flush timeout message from message queue when canceling timer
2015-12-01Support SSH key callback module optionsVipin Nair
This patch allows extra callback options to be passed to the module implementing the SSH callback module behaviour. A module implementing the SSH key callback API is used to customize the handling of public key. This patch allows extra callback options to be passed to the module implementing the SSH callback module behaviour. The key_cb option has been changed: {key_cb, atom()} -> {key_cb, key_cb()} Where: key_cb() :: atom() | {atom(), list()} The callback options, if specified, is made available to the callback module via the options passed to it under the key 'key_cb_private'. More details and some backgorund is available here[1]. [1]: http://erlang.org/pipermail/erlang-patches/2015-November/004800.html
2015-12-01Merge branch 'legoscia/tls_dist_options' into maintZandra
* legoscia/tls_dist_options: Test interface listen option for TLS distribution Test socket listen options for TLS distribution Test port options for TLS distribution TLS Dist: Use inet_dist_ options Conflicts: lib/ssl/src/ssl_tls_dist_proxy.erl lib/ssl/test/ssl_dist_SUITE.erl OTP-12838
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 15:22:14 +0000