aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2018-08-23ssh: Fix non-conforming key generation in kex for x25519 and x448Hans Nilsson
That is, curve25519-sha256, [email protected] and curve448-sha512
2018-08-23ssh: Enable curve448-sha512 and curve25519-sha256Hans Nilsson
2018-08-23ssh: Remove the term 'eddh'Hans Nilsson
2018-08-23Merge branch 'maint-20' into maintLars Thorsen
* maint-20: Updated OTP version Prepare release Updated the engine load functionality Clean up bag index tables Conflicts: OTP_VERSION lib/crypto/c_src/crypto.c lib/crypto/doc/src/notes.xml lib/crypto/vsn.mk lib/mnesia/doc/src/notes.xml lib/mnesia/vsn.mk otp_versions.table
2018-08-23Merge branch 'bjorn/compiler/fix-is_map_key-issues/OTP-15227' into maintBjörn Gustavsson
* bjorn/compiler/fix-is_map_key-issues/OTP-15227: map_SUITE: Test is_map_key/2 followed by a map update beam_validator: Infer the type of the map argument for is_map_key/2 map_SUITE: Cover map_get optimizations in beam_dead
2018-08-23Updated OTP versionOTP-20.3.8.7Erlang/OTP
2018-08-23Prepare releaseErlang/OTP
2018-08-23Merge branch 'lars/crypto/multiple-engine-load/OTP-15233' into maint-20Erlang/OTP
* lars/crypto/multiple-engine-load/OTP-15233: Updated the engine load functionality
2018-08-23Merge branch 'dgud/mnesia/index_bag_clean/OTP-15243' into maint-20Erlang/OTP
* dgud/mnesia/index_bag_clean/OTP-15243: Clean up bag index tables
2018-08-22Merge branch 'ingela/ssl/clean' into maintIngela Anderton Andin
* ingela/ssl/clean: ssl: Move formatting code to own module ssl: Remove legacy files
2018-08-22map_SUITE: Test is_map_key/2 followed by a map updateBjörn Gustavsson
2018-08-22beam_validator: Infer the type of the map argument for is_map_key/2Björn Gustavsson
Make sure that beam_validator considers a call to is_map_key/2 followed by an update of the same map without an is_map/1 test safe. (This situation will probably not be encountered when using the compiler in OTP 21, but better safe than sorry.)
2018-08-22map_SUITE: Cover map_get optimizations in beam_deadBjörn Gustavsson
2018-08-21ssl: Move formatting code to own moduleIngela Anderton Andin
The conversion code for different representations of cipher suites is long an repetitive. We want to hide it in a module that does not have other functions that we like to look at.
2018-08-21ssl: Remove legacy filesIngela Anderton Andin
When starting to implement DTLS, it was assumed that the APIs for TLS and DTLS would differ more. This assumption turned out to be wrong.
2018-08-21Updated the engine load functionalityLars Thorsen
- engine_load/3/4 can be called multiple times for same engine if it allows it (eg doesn't contain global data) - ensure_engine_loaded/2/3 is new functions that guarantees that the engine is just loaded once by adding it to OpenSSL internal engine list and check that before loading. - ensure_engine_unloaded/1/2 is new functions that is used to unload engines loaded with ensure_engine_loaded (remove it from OpenSSL internal engine list and then unload). - new utility functions engine_by_id/1, engine_add/1, engine_remove/1, engine_get_id/1 and engine_get_name/1
2018-08-21Merge branch 'hasse/stdlib/io_lib_errhandling/OTP-15076' into maintHans Bolinder
* hasse/stdlib/io_lib_errhandling/OTP-15076: stdlib: Correct contracts in module io_lib_format stdlib: Improve error handling in module io_lib
2018-08-21Merge branch 'rickard/fix-suspend-monitor-down/OTP-15237/ERL-704' into maintRickard Green
* rickard/fix-suspend-monitor-down/OTP-15237/ERL-704: Fix incoming suspend monitor down
2018-08-20Merge pull request #1934 from marianoguerra/fix-extra-closing-parenthesisRickard Green
erts/time_correction.xml: remove extra closing parenthesis
2018-08-20stdlib: Correct contracts in module io_lib_formatHans Bolinder
2018-08-20stdlib: Improve error handling in module io_libHans Bolinder
2018-08-20Fix incoming suspend monitor downRickard Green
An incoming suspend monitor down wasn't handled correct when the local monitor half had been removed with an emulator crash as result.
2018-08-20Merge pull request #1901 from getong/fix_ssl_exampleIngela Andin
Modernized example
2018-08-17Clean up bag index tablesDan Gudmundsson
Index records for bag tables with ram_copies was not deleted after "real" objects where deleted and thus a memory leak.
2018-08-17Merge branch 'hans/ssh/curve_element/OTP-15244' into maintHans Nilsson
* hans/ssh/curve_element/OTP-15244: ssh: Use the 'macs' tag in crypto:supports/0 ssh: Use the new crypto:supports/0 tag 'curves'
2018-08-17Merge branch 'hans/crypto/curve_in_supports/OTP-14717' into maintHans Nilsson
* hans/crypto/curve_in_supports/OTP-14717: crypto: Try to generate ecdh for all crypto:curves() crypto: Put curve list in C
2018-08-16erts/time_correction.xml: remove extra closing parenthesisMariano Guerra
2018-08-16ssh: Use the 'macs' tag in crypto:supports/0Hans Nilsson
2018-08-16ssh: Use the new crypto:supports/0 tag 'curves'Hans Nilsson
2018-08-16crypto: Try to generate ecdh for all crypto:curves()Hans Nilsson
2018-08-16crypto: Put curve list in CHans Nilsson
2018-08-16Merge branch 'hans/crypto/cuddle_tests' into maintHans Nilsson
* hans/crypto/cuddle_tests: crypto: Fail tests if crypto cannot start
2018-08-16Merge branch 'hans/ssh/cuddle_tests' into maintHans Nilsson
2018-08-16Merge pull request #1728 from davidw/emacs-alignDan Gudmundsson
OTP-15239
2018-08-16Merge pull request #1931 from marianoguerra/fix-doc-errors-maintLukas Larsson
fix double parenthesis and badly formatter <v> tags
2018-08-16Merge pull request #1930 from ↵Lukas Larsson
marianoguerra/fix-emd2exml-encoding-value-gen-maint fix generated encoding for xml files generated with emd2exml
2018-08-15fix double parenthesis and badly formatter <v> tagsMariano Guerra
(cherry picked from commit 1b36c8ff81e896f9aa172603962f838d980668a0)
2018-08-15fix generated encoding for xml files generated with emd2exmlMariano Guerra
DTRACE.xml and SYSTEMTRAP.xml set encoding to utf8 instead of utf-8 and make xmerl_scan:file/1,2 fail parsing them (cherry picked from commit faded6e1cdceb049d2d9bc995b6c981d58709315)
2018-08-15ssh: prolong the timeout in ssh_dbg gen_server callsHans Nilsson
2018-08-15crypto: Fail tests if crypto cannot startHans Nilsson
2018-08-15Merge pull request #1927 from ↵Björn Gustavsson
bjorng/bjorn/compiler/double-receives/ERL-703/OTP-15235 Fix compiler crash when compiling double receives
2018-08-15merge branch 'lukas/erts/fd_driver-fix_pollset_delete/ERL-692/OTP-15236' ↵Lukas Larsson
into maint erts: Delete fd from poll-set when closing fd_driver port
2018-08-15Merge branch 'maint-20' into maintIngela Anderton Andin
* maint-20: inets: Remove 21 test case Updated OTP version Update release notes Conflicts: OTP_VERSION lib/inets/doc/src/notes.xml lib/inets/test/httpd_SUITE.erl lib/inets/vsn.mk otp_versions.table
2018-08-15inets: Remove 21 test caseIngela Anderton Andin
A test case unrelated to the patch was accidentally added when backporting the solution.
2018-08-15Merge branch 'lukas/travis/deploy' into maintLukas Larsson
* lukas/travis/deploy: travis: Make bundle version select regexp stricter
2018-08-15travis: Make bundle version select regexp stricterLukas Larsson
2018-08-15Merge branch 'ingela/inets/status-501/ERIERL-218/OTP-15215' into maintIngela Anderton Andin
* ingela/inets/status-501/ERIERL-218/OTP-15215: inets: Use status code 501 when no mod_* handles the request
2018-08-15Merge branch 'lukas/travis/deploy' into maintLukas Larsson
* lukas/travis/deploy: travis: Filter out release candidates from bundle tags
2018-08-15travis: Filter out release candidates from bundle tagsLukas Larsson
2018-08-15lukas/kernel/logger_set_app_lvl/PR-1843/OTP-15146Lukas Larsson
Add logger:set_application_level/2