aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2018-11-14Merge pull request #2017 from matwey/epmd-helpJohn Högberg
epmd: Move -systemd position in -help output
2018-11-14Merge branch 'maint'Ingela Anderton Andin
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-14Merge branch 'maint'Lukas Larsson
* maint: Updated OTP version Prepare release Optimize operator '--' and yield on large inputs
2018-11-14Merge branch 'maint-18' into maintLukas Larsson
* maint-18: Updated OTP version Prepare release Optimize operator '--' and yield on large inputs Conflicts: OTP_VERSION erts/doc/src/notes.xml erts/emulator/beam/erl_alloc.types erts/emulator/beam/erl_bif_lists.c erts/vsn.mk lib/stdlib/doc/src/notes.xml lib/stdlib/vsn.mk make/otp_version_tickets otp_versions.table
2018-11-12ssl: Handle unicode ~s -> ~tsIngela Anderton Andin
2018-11-12Merge branch 'maint'Ingela Anderton Andin
* maint: Updated OTP version Prepare release
2018-11-12Merge branch 'maint-20' into maintIngela Anderton Andin
* maint-20: Updated OTP version Prepare release
2018-11-12Merge branch 'ingela/ssl/key-derive/OTP-15374'Ingela Anderton Andin
* ingela/ssl/key-derive/OTP-15374: ssl: Add key derivation functions for TLS-1.3
2018-11-12Merge branch 'maint'Ingela Anderton Andin
2018-11-12Merge branch 'ingela/ssl/rsa-kex-engine/ERIERL-268/OTP-15420' into maintIngela Anderton Andin
* ingela/ssl/rsa-kex-engine/ERIERL-268/OTP-15420: ssl: Add engine handling clause to RSA key exchange
2018-11-09epmd: Move -systemd position in -help outputMatwey V. Kornilov
-systemd option help is currently shown in "Interactive options" section. The option is not interactive one. Fixes: b7c95eabf601 ("Add systemd socket activation for epmd") Signed-off-by: Matwey V. Kornilov <[email protected]>
2018-11-09Updated OTP versionOTP-20.3.8.13Erlang/OTP
2018-11-09Prepare releaseErlang/OTP
2018-11-09Merge branch 'ingela/maint-20/ssl/rsa-kex-engine/ERIERL-268/OTP-15420' into ↵Erlang/OTP
maint-20 * ingela/maint-20/ssl/rsa-kex-engine/ERIERL-268/OTP-15420: ssl: Add engine handling clause to RSA key exchange
2018-11-09Merge branch 'maint'Ingela Anderton Andin
2018-11-09Merge branch 'ingela/maint-20/ssl/rsa-kex-engine/ERIERL-268/OTP-15420' into ↵Ingela Anderton Andin
maint
2018-11-09ssl: Add engine handling clause to RSA key exchangeIngela Anderton Andin
2018-11-09ssl: Add engine handling clause to RSA key exchangeIngela Anderton Andin
2018-11-09Merge branch 'maint'Hans Nilsson
* maint: ssh: Clear remote user_dir in ssh_compat_SUITE ssh: Check compatibility with new OpenSSH versions ssh: Fix documentation for public key in ext_info ssh: Fix ssh_options checking for ext_info ssh: Fix SSH_MSG_EXT_INFO bug for OTP SSH as server ssh: Fix SSH_MSG_EXT_INFO bug for OTP SSH as client
2018-11-09Merge branch 'hans/ssh/fix_ext_info_doc' into maintHans Nilsson
* hans/ssh/fix_ext_info_doc: ssh: Fix documentation for public key in ext_info
2018-11-09Merge branch 'hans/ssh/fix_ext_info_tests' into maintHans Nilsson
* hans/ssh/fix_ext_info_tests: ssh: Clear remote user_dir in ssh_compat_SUITE ssh: Check compatibility with new OpenSSH versions
2018-11-09ssh: Clear remote user_dir in ssh_compat_SUITEHans Nilsson
2018-11-09ssh: Check compatibility with new OpenSSH versionsHans Nilsson
2018-11-09ssh: Fix documentation for public key in ext_infoHans Nilsson
2018-11-09Merge branch 'hans/ssh/fix_ext_info/OTP-15413' into maintHans Nilsson
* hans/ssh/fix_ext_info/OTP-15413: ssh: Fix ssh_options checking for ext_info ssh: Fix SSH_MSG_EXT_INFO bug for OTP SSH as server ssh: Fix SSH_MSG_EXT_INFO bug for OTP SSH as client
2018-11-09Updated OTP versionOTP-18.3.4.11maint-18Erlang/OTP
2018-11-09Prepare releaseErlang/OTP
2018-11-09Merge branch 'john/erts/OTP-18.3.4/minusminus_trapping/OTP-15371' into maint-18Erlang/OTP
* john/erts/OTP-18.3.4/minusminus_trapping/OTP-15371: Optimize operator '--' and yield on large inputs
2018-11-09Merge branch 'maint'Lukas Larsson
* maint: Updated OTP version Prepare release Optimize operator '--' and yield on large inputs
2018-11-09Merge branch 'maint-20' into maintLukas Larsson
* maint-20: Updated OTP version Prepare release Optimize operator '--' and yield on large inputs Conflicts: OTP_VERSION erts/doc/src/notes.xml erts/emulator/beam/erl_alloc.types erts/emulator/beam/erl_bif_lists.c erts/vsn.mk lib/ssl/doc/src/notes.xml lib/ssl/vsn.mk lib/stdlib/doc/src/notes.xml lib/stdlib/vsn.mk make/otp_version_tickets otp_versions.table
2018-11-09Merge branch 'maint'John Högberg
* maint: Remove --/2 from dirty BIF tests
2018-11-09Merge branch 'john/erts/remove-minusminus-dirty-test' into maintJohn Högberg
* john/erts/remove-minusminus-dirty-test: Remove --/2 from dirty BIF tests
2018-11-09Remove --/2 from dirty BIF testsJohn Högberg
Now that it traps, --/2 would hang forever when building under --enable-dirty-schedulers-test.
2018-11-09ssl: Add key derivation functions for TLS-1.3Ingela Anderton Andin
2018-11-08Merge pull request #2013 from bjorng/bjorn/compiler/clean-up-beam_utilsBjörn Gustavsson
Clean up the beam_utils module
2018-11-08Merge branch 'maint'Ingela Anderton Andin
2018-11-08Merge branch 'ingela/ssl/erl-dist/ERL-770/OTP-15418' into maintIngela Anderton Andin
* ingela/ssl/erl-dist/ERL-770/OTP-15418: ssl: Correct gen_statem return value
2018-11-08Merge branch 'maint'Hans Nilsson
* maint: ssh: Fix doc error in daemon 'exec' option
2018-11-08Merge branch 'hans/ssh/exec_doc_error/OTP-15416' into maintHans Nilsson
* hans/ssh/exec_doc_error/OTP-15416: ssh: Fix doc error in daemon 'exec' option
2018-11-08ssh: Fix doc error in daemon 'exec' optionHans Nilsson
2018-11-08Merge branch 'maint'Ingela Anderton Andin
2018-11-08Merge branch 'ingela/public-key/more-sha2' into maintIngela Anderton Andin
* ingela/public-key/more-sha2: public_key: Add additional ASN-1 definitions for DSA SHA2 support
2018-11-08ssh: Fix ssh_options checking for ext_infoHans Nilsson
A bug for SSH_MSG_EXT_INFO was fixed both for client and server. Before that fix, wrong option was read for the information sent to the peer. This commit adapts the option checking so that the correct option now used is available not only for servers but also for clients.
2018-11-07Remerge branch 'sverker/erts/ordered_set-select-improvements/OTP-15325'Sverker Eriksson
* sverker/erts/ordered_set-select-improvements/OTP-15325: erts: Tidy some ordered_set iteration code erts: Fix bug for catree iteration
2018-11-07ssh: Fix SSH_MSG_EXT_INFO bug for OTP SSH as serverHans Nilsson
The wrong set of supported public keys was sent to the client.
2018-11-07ssh: Fix SSH_MSG_EXT_INFO bug for OTP SSH as clientHans Nilsson
The message could not be received in connected state
2018-11-07ssl: Correct gen_statem return valueIngela Anderton Andin
Could cause renegotiation to fail
2018-11-07Merge branch 'peterdmv/ssl/fix-logging/OTP-15372'Péter Dimitrov
* peterdmv/ssl/fix-logging/OTP-15372: ssl: Fix logging in new sender process Change-Id: I9e9bfc906dfefb846fe45f80b11d138c415fb61e
2018-11-06public_key: Add additional ASN-1 definitions for DSA SHA2 supportIngela Anderton Andin