aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2015-12-11crypto: Support 192-bit keys for AES CBCSverker Eriksson
and deprecate aes_cbc128 and aes_cbc256 in favor of aes_cbc. This commit is pr 832 squashed, rebased and made work on master https://github.com/erlang/otp/pull/832/commits
2015-12-11Merge branch 'maint'Sverker Eriksson
2015-12-11Merge branch 'sverk/dist-ctrl-msg-overflow' into maintSverker Eriksson
* sverk/dist-ctrl-msg-overflow: erts: Fix faulty cleanup when receiving broken dist msg
2015-12-11Merge branch 'maint'Siri Hansen
2015-12-11erts: Fix faulty cleanup when receiving broken dist msgSverker Eriksson
Bug introduced in ce8279d6a48d41f9. Thank you valgrind.
2015-12-11Merge branch 'siri/sasl/doc-editors/OTP-13000' into maintSiri Hansen
* siri/sasl/doc-editors/OTP-13000: sasl: Editorial changes
2015-12-11Merge branch 'maint'Ingela Anderton Andin
2015-12-11Merge branch 'ia/ssl/ECC-tests' into maintIngela Anderton Andin
* ia/ssl/ECC-tests: ssl: Fix typos
2015-12-11ssl: Fix typosIngela Anderton Andin
2015-12-11Merge branch 'maint'Ingela Anderton Andin
2015-12-11Merge branch 'ia/ssl/windows-tests' into maintIngela Anderton Andin
* ia/ssl/windows-tests: ssl: Use test case time out instead ssl: Use spawn_executable
2015-12-11Merge branch 'ia/ssl/renegotiate-tests' into maintIngela Anderton Andin
* ia/ssl/renegotiate-tests: ssl: Add renegotiation exception
2015-12-11Merge branch 'maint'Lars Thorsen
2015-12-11Merge branch 'lars/correct-doc-bugs' into maintLars Thorsen
2015-12-11[inets] Correct broken linksLars Thorsen
2015-12-11[orber] Align documentation to DTDLars Thorsen
2015-12-11[inets] Align documentation to DTDLars Thorsen
2015-12-11[ssl] Moved description details to man(6) pageLars Thorsen
2015-12-11[ssh] Align documentation to DTDLars Thorsen
2015-12-11[ssl] Correct the documentation so it follows the DTDLars Thorsen
2015-12-11Merge branch 'maint'Lars Thorsen
2015-12-11Merge branch 'lars/erl_docgen/fix-dtd-tags' into maintLars Thorsen
* lars/erl_docgen/fix-dtd-tags: [erl_docgen] Update element section in DTD [erl_docgen] Update element d in DTD [erl_docgen] Update item element in DTD
2015-12-11[erl_docgen] Update element section in DTDLars Thorsen
Allow sections in sections for reference manuals.
2015-12-11[erl_docgen] Update element d in DTDLars Thorsen
Allow seealso in the d element
2015-12-11[erl_docgen] Update item element in DTDLars Thorsen
Allow note, warning, do, dont in item element.
2015-12-11Merge branch 'maint'Peter Andersson
2015-12-11Merge branch 'peppe/common_test/priv_dir_mode_bug' into maintPeter Andersson
* peppe/common_test/priv_dir_mode_bug: Make sure priv_dir names don't cause name clashes OTP-13181
2015-12-11Merge branch 'peppe/common_test/exit_status_when_missing_suites' into maintPeter Andersson
* peppe/common_test/exit_status_when_missing_suites: Let missing suites affect ct:run_test/1 return and ct_run exit status Make abort_if_missing_suites option work in all io modes OTP-13173
2015-12-10Merge branch 'sverk/hash-thresholds'Sverker Eriksson
* sverk/hash-thresholds: erts: Remove unused include files from hash.c erts: Redesign grow/shrink thresholds of hash.c erts: Remove dead code erts_hash_merge
2015-12-10Merge branch 'sverk/crypto-evp-master'Sverker Eriksson
OTP-12217 * sverk/crypto-evp-master: crypto: Avoid bug in OpenSSL-0.9.8 for ECB ciphers Fix EVP_aes_???_ctr to demand OpenSSL 1.0.1 or later. Fix bug for aes_cfb_128_encrypt with empty binary crypto: Refactor nif code to use EVP interface
2015-12-10Let missing suites affect ct:run_test/1 return and ct_run exit statusPeter Andersson
2015-12-10sasl: Editorial changesxsipewe
2015-12-09Merge branch 'maint'Sverker Eriksson
2015-12-09Merge branch 'sverk/dist-ctrl-msg-overflow-master' into masterSverker Eriksson
* sverk/dist-ctrl-msg-overflow-master: erts: Tweak hashmap heap size estimation erts: Fix bug for remote control message containing fat maps erts: Add test for remote exit signal with fat map erts: Fix bug in heap_factory_undo for FACTORY_HEAP_FRAGS mode
2015-12-09Merge branch 'sverk/dist-ctrl-msg-overflow' into maintSverker Eriksson
OTP-13146 (more stuff) * sverk/dist-ctrl-msg-overflow: erts: Tweak hashmap heap size estimation erts: Fix bug for remote control message containing fat maps erts: Add test for remote exit signal with fat map erts: Fix bug in heap_factory_undo for FACTORY_HEAP_FRAGS mode
2015-12-09Merge branch 'maint'Hans Nilsson
2015-12-09Merge branch 'hans/ssh/cuddle_tests' into maintHans Nilsson
* hans/ssh/cuddle_tests: ssh: more info from failed case
2015-12-09ssl: Use test case time out insteadIngela Anderton Andin
2015-12-09ssl: Use spawn_executableIngela Anderton Andin
2015-12-09Merge branch 'maint'Anders Svensson
2015-12-09Merge branch 'anders/diameter/18.2/OTP-13180' into maintAnders Svensson
* anders/diameter/18.2/OTP-13180: vsn -> 1.11.1 Update appup for 18.2
2015-12-09Merge branch 'anders/diameter/request_leak/OTP-13137' into maintAnders Svensson
* anders/diameter/request_leak/OTP-13137: Fix request table leak at retransmission Fix request table leak at exit signal
2015-12-09Fix request table leak at retransmissionAnders Svensson
In the case of retranmission, a prepare_retransmit callback could modify End-to-End and/or Hop-by-Hop identifiers so that the resulting diameter_request entry was not removed, since the removal was of entries with the identifiers of the original request. The chances someone doing this in practice are probably minimal.
2015-12-09Fix request table leak at exit signalAnders Svensson
The storing of request records in the ets table diameter_request was wrapped in a try/after so that the latter would unconditionally remove written entries. The problem is that it didn't deal with the process exiting as a result of an exit signal, since this doesn't raise in an exception. Since the process in question applies callbacks to user code, we can potentially be linked to other process and exit as a result. Trapping exits changes the current behaviour of the process, so spawn a monitoring process that cleans up upon reception of 'DOWN'.
2015-12-09Merge branch 'maint'Hans Bolinder
* maint: [observer] Correct documentation [common_test] Correct documentation Extended table_trans timer in order to handle big data on slow machines Don't log headings without content Speed up receive of many small packages
2015-12-09[observer] Correct documentationHans Bolinder
Fix mistakes found by 'xmllint'.
2015-12-09[common_test] Correct documentationHans Bolinder
Fix mistakes found by 'xmllint'.
2015-12-09ssl: Add renegotiation exceptionIngela Anderton Andin
2015-12-09Merge branch 'siri/ct_netconfc/slow-down/OTP-13007' into maintSiri Hansen
* siri/ct_netconfc/slow-down/OTP-13007: Extended table_trans timer in order to handle big data on slow machines Don't log headings without content Speed up receive of many small packages Conflicts: lib/common_test/src/ct_conn_log_h.erl
2015-12-09Merge branch 'egil/pd-opt-get/OTP-13167'Björn-Egil Dahlberg
* egil/pd-opt-get/OTP-13167: erts: Add i_get_hash instruction erts: Use internal hash for process dictionaries