aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2018-11-23Merge branch 'maint-21' into maintJohn Högberg
* maint-21: Updated OTP version Prepare release
2018-11-23Updated OTP versionOTP-21.1.3Erlang/OTP
2018-11-23Prepare releaseErlang/OTP
2018-11-23Merge branch 'john/erts/spectre-configure-flag-otp_20/OTP-15430/ERIERL-237' ↵Erlang/OTP
into maint-21 * john/erts/spectre-configure-flag-otp_20/OTP-15430/ERIERL-237: Allow disabling retpoline in interpreter loop Add a ./configure flag for spectre mitigation
2018-11-23Merge branch 'john/erts/spectre-configure-flag-otp_20/OTP-15430/ERIERL-237' ↵John Högberg
into maint * john/erts/spectre-configure-flag-otp_20/OTP-15430/ERIERL-237: Allow disabling retpoline in interpreter loop Add a ./configure flag for spectre mitigation
2018-11-22Merge pull request #2026 from bjorng/bjorn/stdlib/fix-missing-warning/ERL-762Björn Gustavsson
Fix inadvertently suppressed warning for unused variable OTP-15437
2018-11-22Merge branch 'sverker/erts/atomics-counters/OTP-13468' into maintSverker Eriksson
AGAIN * sverker/erts/atomics-counters/OTP-13468: erts: Add counters:put/3
2018-11-22Merge branch 'sverker/erts/erl_nif-docs' into maintSverker Eriksson
* sverker/erts/erl_nif-docs: erts: Clarify erl_nif docs about callback environments
2018-11-22Merge branch 'hans/ssh/eddsa/OTP-15094' into maintHans Nilsson
* hans/ssh/eddsa/OTP-15094: ssh: Add forgotten doc about the files ssh_host_ed*_key
2018-11-21erts: Clarify erl_nif docs about callback environmentsSverker Eriksson
2018-11-21erts: Add counters:put/3Sverker Eriksson
2018-11-21ssh: Add forgotten doc about the files ssh_host_ed*_keyHans Nilsson
2018-11-21Merge branch 'bjorn/compiler/is_function/ERL-778/OTP-15435' into maintBjörn Gustavsson
* bjorn/compiler/is_function/ERL-778/OTP-15435: Fix internal consistency failure for is_function/2
2018-11-21Fix inadvertently suppressed warning for unused variableBjörn Gustavsson
An external fun could inadvertently suppress warnings for unused variables, such as in this example: bug() -> BugVar = foo(), if true -> fun m:f/1 end. There would be no warning that `BugVar` was unused. The bug was introduced in ff432e262e652, which was the commit that extended external funs to allow variables. https://bugs.erlang.org/browse/ERL-762
2018-11-20Merge branch 'john/erts/spectre-configure-flag/OTP-15430/ERIERL-237' into ↵John Högberg
john/erts/spectre-configure-flag-otp_20/OTP-15430/ERIERL-237 * john/erts/spectre-configure-flag/OTP-15430/ERIERL-237: Allow disabling retpoline in interpreter loop Add a ./configure flag for spectre mitigation
2018-11-20Allow disabling retpoline in interpreter loopJohn Högberg
We only do this when the user has explicitly told us it's okay to partially disable mitigation (spectre-mitigation=incomplete). The macro is inert if it isn't.
2018-11-20Add a ./configure flag for spectre mitigationJohn Högberg
Note that the ERTS_NO_RETPOLINE macro introduced by this commit is completely inert unless spectre-mitigation is set to 'incomplete.' This includes when mitigation has been manually enabled through CFLAGS, so it should be impossible for it to unintentionally disable mitigation.
2018-11-20Merge branch 'sverker/fixup-dev-runtime-deps' into maintSverker Eriksson
* sverker/fixup-dev-runtime-deps: Fix fixup of development runtime deps
2018-11-20Fix internal consistency failure for is_function/2Björn Gustavsson
There could be an internal consistency failure when using is_function/2, because an optimization did not take into account that is_function/2 can fail. https://bugs.erlang.org/browse/ERL-778
2018-11-19Merge branch 'hans/crypto/eddsa/OTP-15419' into maintHans Nilsson
* hans/crypto/eddsa/OTP-15419: public_key: Add Edward curves to the documentation public_key: Add ed25519 and ed448 sign/verify crypto: Add Edward curves to the documentation crypto: Add eddsa test case (ed25519 and ed448) crypto: Add ed25519 and ed448 sign/verify
2018-11-19Merge branch 'hans/ssh/eddsa/OTP-15094' into maintHans Nilsson
* hans/ssh/eddsa/OTP-15094: ssh: Add Edward curves to the documentation ssh: Update test cases for eddsa ssh: Add public keys 'ssh-ed25519' and 'ssh-ed448'
2018-11-19Merge branch 'hans/ssh/robust_pubkey_prechecks/OTP-15424' into maintHans Nilsson
* hans/ssh/robust_pubkey_prechecks/OTP-15424: ssh: Make host and user key pre-checking better ssh: Generalize unpublished test support option ssh: Cleaning and polishing of ssh_auth ssh: Add a common key_cb call function
2018-11-19ssh: Make host and user key pre-checking betterHans Nilsson
This will prevent crashes in ssh_file for public key types which have no passphrase option although being supported. Also centralize host key checking to avoid code duplication. This was already done for user keys.
2018-11-19ssh: Generalize unpublished test support optionHans Nilsson
Also rename the corresponding testcase in ssh_options_SUITE and add logging.
2018-11-19ssh: Cleaning and polishing of ssh_authHans Nilsson
No intentional api changes. Only to make the code less hard to read.
2018-11-19ssh: Add a common key_cb call functionHans Nilsson
2018-11-19public_key: Add Edward curves to the documentationHans Nilsson
2018-11-19public_key: Add ed25519 and ed448 sign/verifyHans Nilsson
2018-11-19crypto: Add Edward curves to the documentationHans Nilsson
2018-11-19crypto: Add eddsa test case (ed25519 and ed448)Hans Nilsson
2018-11-19crypto: Add ed25519 and ed448 sign/verifyHans Nilsson
2018-11-19ssh: Add Edward curves to the documentationHans Nilsson
2018-11-19ssh: Update test cases for eddsaHans Nilsson
2018-11-19ssh: Add public keys 'ssh-ed25519' and 'ssh-ed448'Hans Nilsson
Requires OpenSSL-1.1.1 https://tools.ietf.org/html/draft-ietf-curdle-ssh-ed25519-ed448-00
2018-11-16Merge branch 'maint-21' into maintJohn Högberg
* maint-21: Updated OTP version Prepare release
2018-11-16Merge branch 'john/erts/defer-orphan-file-close/OTP-15421/ERIERL-261' into maintJohn Högberg
* john/erts/defer-orphan-file-close/OTP-15421/ERIERL-261: Fix broken assertion on monitor release Avoid closing files in gc/monitor callbacks
2018-11-15Merge branch 'sverker/crypto/gcc-8-warning' into maintSverker Eriksson
* sverker/crypto/gcc-8-warning: crypto: Fix gcc 8 warning
2018-11-15Fix fixup of development runtime depsSverker Eriksson
2018-11-15Merge branch 'sverker/erts/atomics-counters/OTP-13468' into maintSverker Eriksson
* sverker/erts/atomics-counters/OTP-13468: erts: Add new module 'counters' erts: Add new module 'atomics'
2018-11-15erts: Add new module 'counters'Sverker Eriksson
2018-11-15erts: Add new module 'atomics'Sverker Eriksson
2018-11-15Updated OTP versionOTP-21.1.2Erlang/OTP
2018-11-15Prepare releaseErlang/OTP
2018-11-15Merge branch 'john/erts/defer-orphan-file-close/OTP-15421/ERIERL-261' into ↵Erlang/OTP
maint-21 * john/erts/defer-orphan-file-close/OTP-15421/ERIERL-261: Fix broken assertion on monitor release Avoid closing files in gc/monitor callbacks
2018-11-15Merge branch 'ingela/public_key/DSA-SHA2/OTP-15367' into maint-21Erlang/OTP
* ingela/public_key/DSA-SHA2/OTP-15367: public_key: Add additional ASN-1 definitions for DSA SHA2 support public_key: Add DSA with SHA2 support
2018-11-15Merge branch 'john/compiler/bs_match-anno-liveness-fix/OTP-15353/ERL-753' ↵Erlang/OTP
into maint-21 * john/compiler/bs_match-anno-liveness-fix/OTP-15353/ERL-753: beam_utils: Handle bs_start_match2 in anno_defs
2018-11-15Merge branch 'maint-20' into maintHans Nilsson
* maint-20: Updated OTP version Prepare release
2018-11-14Merge branch 'ingela/public_key/DSA-SHA2/OTP-15367' into maintIngela Anderton Andin
* ingela/public_key/DSA-SHA2/OTP-15367: public_key: Add additional ASN-1 definitions for DSA SHA2 support
2018-11-14Merge branch 'ingela/ssl/maint-bench-cuddle' into maintIngela Anderton Andin
* ingela/ssl/maint-bench-cuddle: ssl: Handle unicode ~s -> ~ts
2018-11-14Updated OTP versionOTP-20.3.8.14Erlang/OTP