aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2018-09-12Merge branch 'maint'Hans Bolinder
* maint: syntax_tools: Correct unfolding of the stacktrace variable
2018-09-12Merge branch 'hasse/syntax_tools/fix_stacktrace_var/OTP-15291/ERL-719' into ↵Hans Bolinder
maint * hasse/syntax_tools/fix_stacktrace_var/OTP-15291/ERL-719: syntax_tools: Correct unfolding of the stacktrace variable
2018-09-12Merge branch 'peterdmv/ssl/property_test_client_hello'Péter Dimitrov
* peterdmv/ssl/property_test_client_hello: ssl: Property test hello extensions Change-Id: I78f5cdef8702141b78e9123efe34e381a5e5d12c
2018-09-12Merge branch 'maint'Ingela Anderton Andin
2018-09-12Merge branch ↵Ingela Anderton Andin
'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
2018-09-12ssl: Handle incomplete and unorded chainsIngela Anderton Andin
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.
2018-09-12Merge branch 'maint'Hans Nilsson
* maint: crypto: Fix valgrind error
2018-09-12Merge branch 'hans/crypto/valgrind' into maintHans Nilsson
* hans/crypto/valgrind: crypto: Fix valgrind error
2018-09-12crypto: Fix valgrind errorHans Nilsson
2018-09-12Merge branch 'maint'Anders Svensson
2018-09-12Merge branch 'anders/diameter/21.1/OTP-15202' into maintAnders Svensson
* anders/diameter/21.1/OTP-15202: vsn -> 2.1.6 Update appup for 21.1
2018-09-12Merge branch 'anders/diameter/dpr/OTP-15198' into maintAnders Svensson
* anders/diameter/dpr/OTP-15198: Fix function_clause when sending a request after an outgoing DPA
2018-09-11Merge branch 'sverker/enif-cancel-select/OTP-15095'Sverker Eriksson
* sverker/enif-cancel-select/OTP-15095: erts: Add ERL_NIF_SELECT_CANCEL flag for enif_select
2018-09-11ssl: Property test hello extensionsPéter Dimitrov
Extend test generators with ClientHello extensions: - TLS 1.2: supported_version - TLs 1.3: supported_version and signature_scheme_list Change-Id: I43356a2a921edade124eceb004f20411c7e92619
2018-09-11Merge branch 'peterdmv/ssl/tls13_ciphers'Péter Dimitrov
* peterdmv/ssl/tls13_ciphers: ssl: Fix cipher suite handling ssl: Add TLS 1.3 cipher suites Change-Id: I6b306d29642ba38639157ed1afea8b8df38af30e
2018-09-11Merge branch 'maint'Hans Nilsson
* maint: crypto: Remove 'experimental' comments for ecdh
2018-09-11Merge branch 'hans/crypto/x25519_x448/OTP-15240' into maintHans Nilsson
* hans/crypto/x25519_x448/OTP-15240: crypto: Remove 'experimental' comments for ecdh
2018-09-11Merge branch 'maint'Ingela Anderton Andin
2018-09-11Merge branch 'ingela/ssl/psk-correction/OTP-15285' into maintIngela Anderton Andin
* ingela/ssl/psk-correction/OTP-15285: ssl: Correct handling of all PSK cipher suites
2018-09-11ssl: Correct handling of all PSK cipher suitesIngela Anderton Andin
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.
2018-09-10Merge branch 'maint'Dan Gudmundsson
* maint: erlang-mode: fix void variable align-rules-list error
2018-09-10Merge pull request #1942 from velimir0xff/fix-erlang-mode-alignDan Gudmundsson
erlang-mode: fix void variable align-rules-list error
2018-09-10crypto: Remove 'experimental' comments for ecdhHans Nilsson
2018-09-10syntax_tools: Correct unfolding of the stacktrace variableHans Bolinder
The bug was introduced in 9ab233. See also https://bugs.erlang.org/browse/ERL-719.
2018-09-10Merge branch 'maint'Raimo Niskanen
2018-09-10Merge branch 'raimo/improve-doc-indexing/ERL-666' into maintRaimo Niskanen
* raimo/improve-doc-indexing/ERL-666: Correct doc markers Improve indexing of cref docs
2018-09-10Merge branch 'maint'Siri Hansen
2018-09-10vsn -> 2.1.6Anders Svensson
2018-09-10Update appup for 21.1Anders Svensson
OTP-15198 Fix function_clause when sending a request after outgoing DPA
2018-09-10Merge branch 'siri/supervisor/warn-shutdown-race/ERL-724' into maintSiri Hansen
* siri/supervisor/warn-shutdown-race/ERL-724: [supervisor] Add warning about race condition
2018-09-10Merge branch 'siri/cuddle' into maintSiri Hansen
* siri/cuddle: [sasl] Flush logger handlers to file before terminating node
2018-09-07Correct doc markersRaimo Niskanen
2018-09-07Improve indexing of cref docsRaimo Niskanen
2018-09-07Merge branch 'maint'Hans Nilsson
* maint: public_key: Remove strange and unused(?) DSAPrivateKey from verify/5
2018-09-07Merge branch 'hans/public_key/DSAPrivateKey_in_verify/OTP-15284' into maintHans Nilsson
* hans/public_key/DSAPrivateKey_in_verify/OTP-15284: public_key: Remove strange and unused(?) DSAPrivateKey from verify/5
2018-09-07Merge branch 'maint'Hans Nilsson
* maint: crypto: Bug fix - crypto:next_iv regarding aes_ige256 crypto: Bug fix - blowfish_cbc allowed in crypto:next_iv
2018-09-07Merge branch 'hans/crypto/next_iv/OTP-15283' into maintHans Nilsson
* hans/crypto/next_iv/OTP-15283: crypto: Bug fix - crypto:next_iv regarding aes_ige256 crypto: Bug fix - blowfish_cbc allowed in crypto:next_iv
2018-09-07public_key: Remove strange and unused(?) DSAPrivateKey from verify/5Hans Nilsson
2018-09-07crypto: Bug fix - crypto:next_iv regarding aes_ige256Hans Nilsson
2018-09-07crypto: Bug fix - blowfish_cbc allowed in crypto:next_ivHans Nilsson
2018-09-07[supervisor] Add warning about race conditionSiri Hansen
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.
2018-09-07ssl: Fix cipher suite handlingPéter Dimitrov
Implementations of TLS 1.3 which choose to support prior versions of TLS SHOULD support TLS 1.2. That is, a TLS 1.3 ClientHello shall advertise support for TLS 1.2 ciphers in order to be able to connect to TLS 1.2 servers. This commit changes the list of the advertised cipher suites to include old TLS 1.2 ciphers. Change-Id: Iaece3ac4b66a59dfbe97068b682d6010d74522b8
2018-09-07ssl: Add TLS 1.3 cipher suitesPéter Dimitrov
TLS_AES_128_GCM_SHA256 = {0x13,0x01} TLS_AES_256_GCM_SHA384 = {0x13,0x02} TLS_CHACHA20_POLY1305_SHA256 = {0x13,0x03} Change-Id: I3406aaedac812fc43519ff31e5f00d26e375c5d5
2018-09-07Merge branch 'peterdmv/ssl/add_signature_algorithms'Péter Dimitrov
* peterdmv/ssl/add_signature_algorithms: ssl: Use 'HighestVersion' instead of extra function call ssl: Add new extension with encode/decode functions ssl: Format code in handle options Change-Id: Iba3600edc86dc646a7bbabf550d88e7884877e18
2018-09-07Merge branch 'ingela/ssl/property-tests'Ingela Anderton Andin
* ingela/ssl/property-tests: ssl: Correct compression decoding ssl: Add property tests framework ssl: Fix typo
2018-09-06Merge branch 'maint'Rickard Green
* maint: Update PCRE from version 8.41 to version 8.42
2018-09-06Merge branch 'rickard/pcre-8.42/OTP-15217' into maintRickard Green
* rickard/pcre-8.42/OTP-15217: Update PCRE from version 8.41 to version 8.42
2018-09-06Merge branch 'maint'Rickard Green
* maint: erts: Fix configure check when cross-compiling
2018-09-06Merge pull request #1861 from fornwall/fix-cross-compilingRickard Green
erts: Fix configure check when cross-compiling OTP-15282
2018-09-06Merge branch 'maint'Rickard Green
* maint: Updated OTP version Update release notes Update version numbers kernel: Fix missing abort_connection in net_kernel Prevent inconsistent node lists Fix an endless rescheduling loop when a process is executing process_info(self(), ...)