summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | Merge branch 'hasse/syntax_tools/fix_revert/OTP-15294' into maintHans Bolinder2018-09-143-6/+92
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * hasse/syntax_tools/fix_revert/OTP-15294: erts: Add comment about [] and nil() to The Abstract Format syntax_tools: Correct erl_syntax:revert/1
| * | | | | | | | erts: Add comment about [] and nil() to The Abstract FormatHans Bolinder2018-09-141-1/+3
| | | | | | | | |
| * | | | | | | | syntax_tools: Correct erl_syntax:revert/1Hans Bolinder2018-09-122-5/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | revert/1 did not handle the types tuple() and map() correctly.
* | | | | | | | | Merge branch 'hans/crypto/SHA3/OTP-15153' into maintHans Nilsson2018-09-131-2/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | crypto: sha3_224 and sha3_256 errors fixedHans Nilsson2018-09-121-2/+5
| | | | | | | | | |
* | | | | | | | | | Merge branch 'hans/crypto/doc/OTP-15134' into maintHans Nilsson2018-09-1315-1491/+2068
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * hans/crypto/doc/OTP-15134: ssh: Use exported crypto types public_key: Generate refman from types and specs public_key: Rework -type and -spec Check existing specs with code and documentation and adjust. Prepare for doc generation public_key: Setup for doc generation public_key: Remove special type signature for one test crypto: Add missing documentation for enable_fips_mode/1 crypto: Generate refman from types and specs and fix links in engine chapter for generated crypto module refman crypto: Rework -type and -spec Check code and documentation and write -type/-spec or adjust existing. Prepare for doc generation crypto: Setup for doc generation crypto: A user's guide chapter on algorithm details Such as keylengths, blocksizes and IV lengths are hard to find otherwise
| * | | | | | | | | ssh: Use exported crypto typesHans Nilsson2018-09-131-7/+1
| | | | | | | | | |
| * | | | | | | | | public_key: Generate refman from types and specsHans Nilsson2018-09-131-444/+240
| | | | | | | | | |
| * | | | | | | | | public_key: Rework -type and -specHans Nilsson2018-09-131-170/+269
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check existing specs with code and documentation and adjust. Prepare for doc generation
| * | | | | | | | | public_key: Setup for doc generationHans Nilsson2018-09-133-0/+12
| | | | | | | | | |
| * | | | | | | | | public_key: Remove special type signature for one testHans Nilsson2018-09-131-4/+0
| | | | | | | | | |
| * | | | | | | | | crypto: Add missing documentation for enable_fips_mode/1Hans Nilsson2018-09-132-3/+22
| | | | | | | | | |
| * | | | | | | | | crypto: Generate refman from types and specsHans Nilsson2018-09-132-625/+481
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and fix links in engine chapter for generated crypto module refman
| * | | | | | | | | crypto: Rework -type and -specHans Nilsson2018-09-131-237/+739
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check code and documentation and write -type/-spec or adjust existing. Prepare for doc generation
| * | | | | | | | | crypto: Setup for doc generationHans Nilsson2018-09-133-0/+12
| | | | | | | | | |
| * | | | | | | | | crypto: A user's guide chapter on algorithm detailsHans Nilsson2018-09-133-1/+292
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Such as keylengths, blocksizes and IV lengths are hard to find otherwise Conflicts: lib/crypto/doc/src/crypto.xml
* | | | | | | | | | Merge branch 'maint-21' into maintRickard Green2018-09-1211-55/+118
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * maint-21: Updated OTP version Update release notes Update version numbers erts: Fix "Prevent inconsistent node lists" fix Fix include-path regression caused by dd0a39c Restore default SIGTERM behaviour for port programs
| * | | | | | | | | Updated OTP versionOTP-21.0.9Erlang/OTP2018-09-112-1/+2
| | | | | | | | | |
| * | | | | | | | | Update release notesErlang/OTP2018-09-112-0/+46
| | | | | | | | | |
| * | | | | | | | | Update version numbersErlang/OTP2018-09-112-2/+2
| | | | | | | | | |
| * | | | | | | | | Merge branch 'sverker/erts/fix-aborted-pending-connection-race/OTP-15296' ↵Erlang/OTP2018-09-113-51/+57
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into maint-21 * sverker/erts/fix-aborted-pending-connection-race/OTP-15296: erts: Fix "Prevent inconsistent node lists" fix
| | * | | | | | | | | erts: Fix "Prevent inconsistent node lists" fixSverker Eriksson2018-09-113-51/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | done in a31216200bdee2c04b3fb3ae5e26607674715c8a that could cause a new pending connection to be incorrectly aborted.
| * | | | | | | | | | Merge branch 'john/compiler/fix-rebar-recompiles-maint-21/OTP-15292' into ↵Erlang/OTP2018-09-111-1/+0
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | maint-21 * john/compiler/fix-rebar-recompiles-maint-21/OTP-15292: Fix include-path regression caused by dd0a39c
| | * | | | | | | | | | Fix include-path regression caused by dd0a39cJohn Högberg2018-09-101-1/+0
| | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include paths don't actually affect code generation in any way, but it's reasonable for a build tool like rebar3 to recompile when the include paths change. This commit restores the old behavior without the +deterministic flag.
| * | | | | | | | | | Merge branch 'rickard/port-prog-sigterm-fix/OTP-15289' into maint-21Erlang/OTP2018-09-111-0/+11
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * rickard/port-prog-sigterm-fix/OTP-15289: Restore default SIGTERM behaviour for port programs
| | * | | | | | | | | Restore default SIGTERM behaviour for port programsRickard Green2018-09-101-0/+11
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | erl_child_setup program ignores TERM signals as of ERTS version 10.0 (cff8dce0). This setting was unfortunately inherited by port programs. This commit restores handling of TERM signals in port programs to the default behavior. That is, terminate the process.
* | | | | | | | | | Merge branch 'hasse/syntax_tools/fix_stacktrace_var/OTP-15291/ERL-719' into ↵Hans Bolinder2018-09-122-3/+13
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | maint * hasse/syntax_tools/fix_stacktrace_var/OTP-15291/ERL-719: syntax_tools: Correct unfolding of the stacktrace variable
| * | | | | | | | | syntax_tools: Correct unfolding of the stacktrace variableHans Bolinder2018-09-102-3/+13
| | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bug was introduced in 9ab233. See also https://bugs.erlang.org/browse/ERL-719.
* | | | | | | | | Merge branch ↵Ingela Anderton Andin2018-09-124-44/+169
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'ingela/ssl/unorded-or-incomplete-cert-chain/OTP-12983/OTP-15060' into maint * ingela/ssl/unorded-or-incomplete-cert-chain/OTP-12983/OTP-15060: ssl: Handle incomplete and unorded chains
| * | | | | | | | ssl: Handle incomplete and unorded chainsIngela Anderton Andin2018-09-124-44/+169
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the peer sends an incomplete chain that we can reconstruct with our known CA-certs it will be accepted. We will assume that the peer honors the protocol and sends an orded chain, however if validation fails we will try to order the chain in case it was unorded. Will also handle that extraneous cert where present. See Note form RFC 8446 Note: Prior to TLS 1.3, "certificate_list" ordering required each certificate to certify the one immediately preceding it; however, some implementations allowed some flexibility. Servers sometimes send both a current and deprecated intermediate for transitional purposes, and others are simply configured incorrectly, but these cases can nonetheless be validated properly. For maximum compatibility, all implementations SHOULD be prepared to handle potentially extraneous certificates and arbitrary orderings from any TLS version, with the exception of the end-entity certificate which MUST be first.
* | | | | | | | | Merge branch 'hans/crypto/valgrind' into maintHans Nilsson2018-09-121-1/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * hans/crypto/valgrind: crypto: Fix valgrind error
| * | | | | | | | | crypto: Fix valgrind errorHans Nilsson2018-09-121-1/+5
|/ / / / / / / / /
* | | | | | | | | Merge branch 'anders/diameter/21.1/OTP-15202' into maintAnders Svensson2018-09-122-3/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * anders/diameter/21.1/OTP-15202: vsn -> 2.1.6 Update appup for 21.1
| * | | | | | | | | vsn -> 2.1.6Anders Svensson2018-09-101-1/+1
| | | | | | | | | |
| * | | | | | | | | Update appup for 21.1Anders Svensson2018-09-101-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OTP-15198 Fix function_clause when sending a request after outgoing DPA
* | | | | | | | | | Merge branch 'anders/diameter/dpr/OTP-15198' into maintAnders Svensson2018-09-121-2/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * anders/diameter/dpr/OTP-15198: Fix function_clause when sending a request after an outgoing DPA
| * | | | | | | | | | Fix function_clause when sending a request after an outgoing DPAAnders Svensson2018-07-181-2/+2
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After DPR, the intention is that outgoing answers are sent and outgoing requests are discarded. This was the case when the DPR was outgoing, but if it was incoming then a subsequent outgoing request resulted in a function_clause, bringing down the diameter_peer_fsm gen_server associated with the transport connection in question. With diameter_tcp/sctp, the failure can result in the connection being reset before the peer closes it in response to DPA, but is otherwise harmless since DPR means that the connection is already on its way down.
* | | | | | | | | | Merge branch 'hans/crypto/x25519_x448/OTP-15240' into maintHans Nilsson2018-09-111-11/+6
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * hans/crypto/x25519_x448/OTP-15240: crypto: Remove 'experimental' comments for ecdh
| * | | | | | | | | crypto: Remove 'experimental' comments for ecdhHans Nilsson2018-09-101-11/+6
| | | | | | | | | |
* | | | | | | | | | Merge branch 'ingela/ssl/psk-correction/OTP-15285' into maintIngela Anderton Andin2018-09-113-15/+23
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ingela/ssl/psk-correction/OTP-15285: ssl: Correct handling of all PSK cipher suites
| * | | | | | | | | | ssl: Correct handling of all PSK cipher suitesIngela Anderton Andin2018-09-113-15/+23
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before only some PSK suites would be correctly negotiated and most PSK ciphers suites would fail the connection. PSK cipher suites are anonymous in the sense that they do not use certificates except for rsa_psk.
* | | | | | | | | | Merge pull request #1942 from velimir0xff/fix-erlang-mode-alignDan Gudmundsson2018-09-101-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | erlang-mode: fix void variable align-rules-list error
| * | | | | | | | | | erlang-mode: fix void variable align-rules-list errorGrigory Starinkin2018-08-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | erlang-mode crashes with the following error: Symbol’s value as variable is void: align-rules-list caused by #1728
* | | | | | | | | | | Merge branch 'raimo/improve-doc-indexing/ERL-666' into maintRaimo Niskanen2018-09-102-19/+88
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * raimo/improve-doc-indexing/ERL-666: Correct doc markers Improve indexing of cref docs
| * | | | | | | | | | Correct doc markersRaimo Niskanen2018-09-071-9/+17
| | | | | | | | | | |
| * | | | | | | | | | Improve indexing of cref docsRaimo Niskanen2018-09-071-10/+71
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'siri/supervisor/warn-shutdown-race/ERL-724' into maintSiri Hansen2018-09-102-4/+17
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * siri/supervisor/warn-shutdown-race/ERL-724: [supervisor] Add warning about race condition
| * | | | | | | | | | | [supervisor] Add warning about race conditionSiri Hansen2018-09-072-4/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ERL-724: "During a 'gentle' shutdown, supervisors unlink from their children before sending shutdown signals to them. This can lead to a race condition in supervision trees, when the timeout for gentle shutdown of a parent supervisor expires and it kills a child supervisor that has just unlinked from a child of its own, leaving the child supervisor's own child still running after its supervisor is killed." This commit adds a warning about this in the documentation.
* | | | | | | | | | | | Merge branch 'siri/cuddle' into maintSiri Hansen2018-09-101-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * siri/cuddle: [sasl] Flush logger handlers to file before terminating node
| * | | | | | | | | | | | [sasl] Flush logger handlers to file before terminating nodeSiri Hansen2018-09-041-0/+3
| |/ / / / / / / / / / /