aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2019-01-07Merge branch 'bjorn/compiler/interim-tuple-bug/OTP-15501/ERL-807' into maintBjörn Gustavsson
* bjorn/compiler/interim-tuple-bug/OTP-15501/ERL-807: Remove unsafe optimization for delaying creation of stackframe
2019-01-07Merge branch 'maint'Hans Nilsson
* maint: ssh: Wait a bit for the docker client to finnish in ssh_compat_SUITE
2019-01-07Merge branch 'hans/ssh/cuddle_tests' into maintHans Nilsson
* hans/ssh/cuddle_tests: ssh: Wait a bit for the docker client to finnish in ssh_compat_SUITE
2019-01-07Merge branch 'maint'Ingela Anderton Andin
Conflicts: lib/ssl/src/ssl_handshake.erl
2019-01-07ssh: Wait a bit for the docker client to finnish in ssh_compat_SUITEHans Nilsson
The testing with a remote client in a docker and a local server could show some hazards. For instance instructing the client to sftp a file to the server is not necessarily ready in the server's file system when the common_test is scheduled. To avoid that the test suite dooms a file operation to not have been performed, simply sleep at increasing times for a while with testing if it is done. After a while give up and signal a fault.
2019-01-07Merge pull request #2063 from bjorng/bjorn/compiler/options/OTP-15456Björn Gustavsson
Make all compiler options work in the option list
2019-01-07Merge branch 'ingela/ssl/error-handling-should-be-throw/OTP-15502' into maintIngela Anderton Andin
* ingela/ssl/error-handling-should-be-throw/OTP-15502: ssl: Clean up extension handling
2019-01-07Merge pull request #2059 from michalmuskala/mm/bif-microopsBjörn Gustavsson
Use microops for BIFs
2019-01-07Remove unsafe optimization for delaying creation of stackframeBjörn Gustavsson
b89044a800c4 introduced an optimization that tries to delay creation of stack frames. It turns out that this optimization is not always safe. (See the new test case for an example.) Since the code generator is completely rewritten in the `master` branch for the upcoming OTP 22 release, it does not make sense trying to mend this optimization. It is better to remove it. Out of a sample of about 1000 modules in OTP, about 50 of them are changed as a result of removing this optimization. The compiler in OTP 22 will do the same optimization in a cleaner, safer, and more effective way. https://bugs.erlang.org/browse/ERL-807
2019-01-07Merge branch 'maint'Hans Nilsson
* maint: Fix sftpd interop for SSH_FXP_STAT
2019-01-07Merge pull request #2077 from KryoStoffer/maintHans Nilsson
ERL-822 Fix sftpd interop for SSH_FXP_STAT OTP-15498
2019-01-04Fix sftpd interop for SSH_FXP_STATKristoffer Larsen
Some SFTP client's have been discover to claim one version of the protocol and send messages in a different version. In the spirit of Postel's law, we can for SSH_FXP_STAT, ignore the differences in the protocol, as we are not doing anything with the flags anyway.
2019-01-03Merge branch 'maint'Hans Nilsson
* maint: Updated OTP version Prepare release
2019-01-03Merge branch 'maint-20' into maintHans Nilsson
* maint-20: Updated OTP version Prepare release
2019-01-02Merge branch 'hans/crypto/Makefile_fixes/OTP-14732'Hans Nilsson
* hans/crypto/Makefile_fixes/OTP-14732: crypto: Fix 'make clean'
2019-01-02crypto: Fix 'make clean'Hans Nilsson
2019-01-02Merge pull request #2068 from hogand/crypto/split-c-filesHans Nilsson
crypto: Split up crypto.c into multiple files OTP-14732
2018-12-28Updated OTP versionOTP-20.3.8.16Erlang/OTP
2018-12-28Prepare releaseErlang/OTP
2018-12-28Merge branch 'hans/ssh/port_leak/OTP-15397' into maint-20Erlang/OTP
* hans/ssh/port_leak/OTP-15397: ssh: Fix port leakage for daemons failing at start ssh: Add port close test
2018-12-28Merge branch 'sverker/big-band-bug/ERL-804/OTP-15487' into maint-20Erlang/OTP
* sverker/big-band-bug/ERL-804/OTP-15487: erts: Fix bug in 'band' of two negative numbers, one big
2018-12-28Merge branch 'maint'Hans Nilsson
* maint: Updated OTP version Prepare release ssh: Fix port leakage for daemons failing at start ssh: Add port close test
2018-12-28Merge branch 'maint-21' into maintHans Nilsson
* maint-21: Updated OTP version Prepare release ssh: Fix port leakage for daemons failing at start ssh: Add port close test
2018-12-27Updated OTP versionOTP-21.2.2Erlang/OTP
2018-12-27Prepare releaseErlang/OTP
2018-12-27Merge branch 'hans/ssh/port_leak/OTP-15397' into maint-21Erlang/OTP
* hans/ssh/port_leak/OTP-15397: ssh: Fix port leakage for daemons failing at start ssh: Add port close test # Conflicts: # lib/ssh/test/ssh_basic_SUITE.erl
2018-12-21If init_atoms() fails, it should return __LINE__Doug Hogan
2018-12-21Make engine ctx init internal to engine.c per PR feedbackDoug Hogan
2018-12-21Make cipher ctx init internal to cipher.c per PR feedbackDoug Hogan
2018-12-21Make hash ctx init internal to hash.c per PR feedbackDoug Hogan
2018-12-21Make HMAC ctx init internal to hmac.c per PR feedbackDoug Hogan
2018-12-21ssh: Fix port leakage for daemons failing at startHans Nilsson
2018-12-21ssh: Add port close testHans Nilsson
2018-12-21ssl: Clean up extension handlingIngela Anderton Andin
Use throw stratgy for erro handling in extension handling. Makes code consistent and easier to refactor. Also fixes bug that an incorrect return value for gen_statem could be created when alert was a result of handling renegotiation info extension.
2018-12-21Avoid unused warning with old OpenSSL versions per PR feedbackDoug Hogan
2018-12-21erts: Fix persistent_term testcasesLukas Larsson
2018-12-21Merge branch 'maint'Lukas Larsson
2018-12-21Merge branch 'lukas/erts/inet_pktopts_old_linux/OTP-15494' into maintLukas Larsson
* lukas/erts/inet_pktopts_old_linux/OTP-15494: erts: Fix inet pktopts on very old linux kernels
2018-12-21Merge branch 'maint'Ingela Anderton Andin
* maint: Updated OTP version Prepare release
2018-12-21Merge branch 'maint-21' into maintIngela Anderton Andin
* maint-21: Updated OTP version Prepare release
2018-12-20Add Ericsson AB copyright header to all new filesDoug Hogan
Using the same copyright header as crypto.c
2018-12-20Remove chacha20.h dependency in aead.cDoug Hogan
While it uses chacha20, it doesn't use Erlang chacha20 functions.
2018-12-20erts: Add ERL_NIF_SELECT_CUSTOM_MSGSverker Eriksson
2018-12-20Merge branch 'maint'Ingela Anderton Andin
2018-12-20Updated OTP versionOTP-21.2.1Erlang/OTP
2018-12-20Prepare releaseErlang/OTP
2018-12-20Merge branch 'ingela/ssl/patch-maint-21/ERL-308/OTP-15489' into maint-21Erlang/OTP
* ingela/ssl/patch-maint-21/ERL-308/OTP-15489: ssl: Fix renegotiation with new TLS sender ssl: Add renegotiate test case ssl: Remove no longer needed functions ssl: Fix downgrade ssl: Remove checks and conversions not needed ssl: Use binary:copy/2 to avoid list overhead ssl: Remove unnecessary internal event ssl: Clean code ssl: Add static_env record
2018-12-20Merge branch 'sverker/big-band-bug/ERL-804/OTP-15487' into maint-21Erlang/OTP
* sverker/big-band-bug/ERL-804/OTP-15487: erts: Fix bug in 'band' of two negative numbers, one big
2018-12-20Merge branch 'sverker/fix-atomics-get-large-unsigned/PR-2061/OTP-15486' into ↵Erlang/OTP
maint-21 * sverker/fix-atomics-get-large-unsigned/PR-2061/OTP-15486: erts: Fix possible heap corruption getting atomics
2018-12-20Merge branch 'sverker/erts/prim_file-perm-own-bigendian/OTP-15485' into maint-21Erlang/OTP
* sverker/erts/prim_file-perm-own-bigendian/OTP-15485: erts: Fix warning and potential big-endian-bug in prim_file