aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2019-06-11Merge branch 'maint'Hans Nilsson
* maint: Remove duplication of SSH encoding macros Remove duplicate ssh_userauth.hrl
2019-06-11Merge branch 'hans/ssh/internal_cleaning/PR-2255/PR-2256/OTP-15876' into maintHans Nilsson
* hans/ssh/internal_cleaning/PR-2255/PR-2256/OTP-15876: Remove duplication of SSH encoding macros Remove duplicate ssh_userauth.hrl
2019-06-11Merge branch 'maint'Péter Dimitrov
* maint: ssl: Update standards compliance ssl: Fix alert handling (TLS 1.3) ssl: Add tests for ALPN in TLS 1.3 ssl: Implement ALPN in TLS 1.3 ssl: Add TLS 1.3 test group to ssl_certificate_verify_SUITE ssl: Fix negative tests in ssl_basic_SUITE
2019-06-11Merge pull request #2276 from peterdmv/ssl/tls13-alpnPéter Dimitrov
Implement ALPN in TLS 1.3
2019-06-11Merge branch 'maint'Ingela Anderton Andin
2019-06-11Merge branch 'ingela/public_key/PEBS2-AES/ERL-952/OTP-15870' into maintIngela Anderton Andin
* ingela/public_key/PEBS2-AES/ERL-952/OTP-15870: public_key: Add AES to PBE2
2019-06-11Merge branch 'maint'John Högberg
* maint: erts: Fix bad loader optimization of get_tuple_element beam_ssa_type: Fix incorrect bitstring unit determination
2019-06-11Merge branch 'john/erts/fix-bad-get_tuple_element-opt/OTP-15871/ERIERL-374' ↵John Högberg
into maint * john/erts/fix-bad-get_tuple_element-opt/OTP-15871/ERIERL-374: erts: Fix bad loader optimization of get_tuple_element
2019-06-11Merge branch 'john/compiler/fix-bad-bitstring-type-opt/OTP-15872' into maintJohn Högberg
* john/compiler/fix-bad-bitstring-type-opt/OTP-15872: beam_ssa_type: Fix incorrect bitstring unit determination
2019-06-10Merge branch 'maint'Sverker Eriksson
2019-06-10Merge branch 'sverker/erts/hipe-arm-freebsd-clear-cache/ERL-958' into maintSverker Eriksson
OTP-15874 PR-2266 * sverker/erts/hipe-arm-freebsd-clear-cache/ERL-958: erts: Fix hipe_flush_icache_range for FreeBSD on ARM
2019-06-10erts: Fix hipe_flush_icache_range for FreeBSD on ARMSverker Eriksson
Avoid old Linux specific syscall assembler if we can.
2019-06-10Merge branch 'maint'Sverker Eriksson
2019-06-10Merge branch ↵Sverker Eriksson
'sverker/erts/process-info-reductions-idle-proc/ERL-964/OTP-15865' into maint * sverker/erts/process-info-reductions-idle-proc/ERL-964/OTP-15865: erts: Improve test of process_info(reductions) Revert "erts: Force process_info(reductions) as signal"
2019-06-10erts: Improve test of process_info(reductions)Sverker Eriksson
to provoke case when the main lock is released during execution.
2019-06-10Merge branch 'maint'Sverker Eriksson
2019-06-10Merge branch 'sverker/erts/break-p-segv/ERL-965/OTP-15873' into maintSverker Eriksson
* sverker/erts/break-p-segv/ERL-965/OTP-15873: erts: Fix SEGV crash on shell break (p)roc info
2019-06-10erts: Fix bad loader optimization of get_tuple_elementJohn Högberg
The following sequence would be wrongly optimized into a i_get_tuple_element2 instruction, reading an element from the wrong tuple: {get_tuple_element,{x,0},1,{x,0}}. {get_tuple_element,{x,0},2,{x,1}}.
2019-06-10beam_ssa_type: Fix incorrect bitstring unit determinationJohn Högberg
The compiler would treat the "Unit" of bs_init instructions as the unit of the result instead of the required unit of the input, causing is_binary checks to be wrongly optimized away.
2019-06-10Merge branch 'sverker/pre-push-detect-upgrade'Sverker Eriksson
2019-06-10Write pre-push error messages with red colorSverker Eriksson
2019-06-10Add pre-push update notificationSverker Eriksson
2019-06-10Merge branch 'maint'Siri Hansen
2019-06-10Merge branch ↵Siri Hansen
'siri/ct/hook-terminated-not-initiated/maint-21/ERIERL-370/OTP-15863' into maint * siri/ct/hook-terminated-not-initiated/maint-21/ERIERL-370/OTP-15863: [ct] Fix bug where Hook:terminate/1 was called before Hook:init/2
2019-06-10Merge branch 'maint'Siri Hansen
2019-06-10Merge branch 'siri/ct/hook-terminated-not-initiated/ERIERL-370/OTP-15863' ↵Siri Hansen
into maint * siri/ct/hook-terminated-not-initiated/ERIERL-370/OTP-15863: [ct] Fix bug where Hook:terminate/1 was called before Hook:init/2
2019-06-10public_key: Add AES to PBE2Ingela Anderton Andin
2019-06-10Merge branch 'maint'Ingela Anderton Andin
2019-06-10Merge branch 'ingela/ssl/dtls-multiplxor/ERL-962/OTP-15864' into maintIngela Anderton Andin
* ingela/ssl/dtls-multiplxor/ERL-962/OTP-15864: ssl: Add missing gen_server return value in DTLS packet demux process
2019-06-10Testing two PRsHans Nilsson
Merge commit '508ddd5aaa189ddcf7a06f4342c187b07ec1734a'; commit '5160870a868bfcb29bd8f1a2c12b7b7b7963d946' into hans/ssh/PRs * commit '508ddd5aaa189ddcf7a06f4342c187b07ec1734a': Remove duplication of SSH encoding macros * commit '5160870a868bfcb29bd8f1a2c12b7b7b7963d946': Remove duplicate ssh_userauth.hrl
2019-06-07ssl: Add missing gen_server return value in DTLS packet demux processIngela Anderton Andin
2019-06-07ssl: Update standards compliancePéter Dimitrov
2019-06-07ssl: Fix alert handling (TLS 1.3)Péter Dimitrov
Server and client use different secrets when sending certificate related alerts. This is due to a change to the TLS protocol where clients send their 'certificate' message after they have received the server's 'finished' message.
2019-06-07ssl: Add tests for ALPN in TLS 1.3Péter Dimitrov
2019-06-07ssl: Implement ALPN in TLS 1.3Péter Dimitrov
2019-06-07ssl: Add TLS 1.3 test group to ssl_certificate_verify_SUITEPéter Dimitrov
2019-06-07ssl: Fix negative tests in ssl_basic_SUITEPéter Dimitrov
2019-06-06Remove duplication of SSH encoding macrosPaul Meinhardt
2019-06-06Remove duplicate ssh_userauth.hrlPaul Meinhardt
The `ssh_userauth.hrl` header file was a duplicate of `ssh_auth.hrl` not used anywhere except for the ssh benchmark suite.
2019-06-05Let pre-push hook detect when it needs an upgradeSverker Eriksson
after a master release.
2019-06-05Merge branch 'maint'Siri Hansen
2019-06-05Merge branch 'siri/logger/relatve-log-file-path/OTP-15850' into maintSiri Hansen
* siri/logger/relatve-log-file-path/OTP-15850: [logger] Store file name as absolute path in logger_std_h
2019-06-05Merge branch 'maint'Hans Bolinder
* maint: dialyzer: Correct indentation of field warnings
2019-06-05Merge branch 'hasse/dialyzer/fix_string_split/OTP-15861/ERL-953' into maintHans Bolinder
* hasse/dialyzer/fix_string_split/OTP-15861/ERL-953: dialyzer: Correct indentation of field warnings
2019-06-05Merge branch 'maint'Ingela Anderton Andin
2019-06-05Merge branch 'ingela/ssl/ret-ext/ERL-951/OTP-15862' into maintIngela Anderton Andin
* ingela/ssl/ret-ext/ERL-951/OTP-15862: ssl: Fix broken return value
2019-06-05ssl: Fix broken return valueIngela Anderton Andin
2019-06-05[ct] Fix bug where Hook:terminate/1 was called before Hook:init/2Siri Hansen
This problem was introduced with commit acd87425acf7705328b01aa8f0a804207ffe4790, when the new hook function post_groups/2 and post_all/3 were added.
2019-06-04erts: Fix SEGV crash on shell break (p)roc infoSverker Eriksson
esdp==NULL if run by non scheduler thread.
2019-06-04Merge branch 'maint'Ingela Anderton Andin