summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* ssl: Implement the 'key_share' extensionPéter Dimitrov2018-11-1612-101/+370
* Merge branch 'maint'John Högberg2018-11-164-2/+33
|\
| * Merge branch 'maint-21' into maintJohn Högberg2018-11-164-2/+33
| |\
| | * Prepare releaseErlang/OTP2018-11-154-2/+33
| | * Merge branch 'ingela/public_key/DSA-SHA2/OTP-15367' into maint-21Erlang/OTP2018-11-153-3/+36
| | |\
| | | * public_key: Add additional ASN-1 definitions for DSA SHA2 supportIngela Anderton Andin2018-11-081-2/+15
| | | * public_key: Add DSA with SHA2 supportIngela Anderton Andin2018-10-193-1/+21
* | | | Merge branch 'henrik/kernel/bad_erl_libs'Henrik Nord2018-11-161-2/+8
|\ \ \ \
| * | | | make sure a set ERL_LIBS does not interfere with testsHenrik Nord2018-10-041-2/+8
* | | | | Merge pull request #2018 from bjorng/bjorn/compiler/speedBjörn Gustavsson2018-11-163-42/+128
|\ \ \ \ \
| * | | | | beam_ssa_dead: Speed up optimization of switch instructionsBjörn Gustavsson2018-11-151-28/+31
| * | | | | beam_ssa_pre_codegen: Eliminate a bottleneck in linear scanBjörn Gustavsson2018-11-151-1/+7
| * | | | | beam_ssa_type: Speed up type analysis for huge functionsBjörn Gustavsson2018-11-151-13/+90
* | | | | | Merge branch 'maint'Sverker Eriksson2018-11-151-1/+5
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge branch 'sverker/crypto/gcc-8-warning' into maintSverker Eriksson2018-11-151-1/+5
| |\ \ \ \ \
| | * | | | | crypto: Fix gcc 8 warningSverker Eriksson2018-11-051-1/+5
* | | | | | | Merge branch 'maint'Sverker Eriksson2018-11-152-2/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'sverker/erts/atomics-counters/OTP-13468' into maintSverker Eriksson2018-11-152-2/+2
| |\ \ \ \ \ \
| | * | | | | | erts: Add new module 'counters'Sverker Eriksson2018-11-151-1/+1
| | * | | | | | erts: Add new module 'atomics'Sverker Eriksson2018-11-152-2/+2
* | | | | | | | Merge branch 'maint'Hans Nilsson2018-11-151-1/+16
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | / / / / | |_|_|/ / / / |/| | | | | |
| * | | | | | Merge branch 'maint-20' into maintHans Nilsson2018-11-151-1/+16
| |\ \ \ \ \ \
| | * | | | | | Prepare releaseErlang/OTP2018-11-142-1/+17
| | * | | | | | Merge branch 'hans/ssh/fix_ext_info/OTP-15413' into maint-20Erlang/OTP2018-11-143-8/+11
| | |\ \ \ \ \ \
* | | \ \ \ \ \ \ Merge branch 'maint'Ingela Anderton Andin2018-11-141-2/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge branch 'ingela/ssl/maint-bench-cuddle' into maintIngela Anderton Andin2018-11-141-2/+2
| |\ \ \ \ \ \ \ \
| | * | | | | | | | ssl: Handle unicode ~s -> ~tsIngela Anderton Andin2018-11-121-2/+2
* | | | | | | | | | Merge branch 'maint'Lukas Larsson2018-11-142-0/+22
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge branch 'maint-18' into maintLukas Larsson2018-11-142-0/+22
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | Prepare releaseErlang/OTP2018-11-092-1/+16
| | * | | | | | | | Merge branch 'john/erts/OTP-18.3.4/minusminus_trapping/OTP-15371' into maint-18Erlang/OTP2018-11-092-6/+42
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Optimize operator '--' and yield on large inputsJohn Högberg2018-11-052-6/+42
* | | | | | | | | | | Merge branch 'maint'Ingela Anderton Andin2018-11-121-0/+15
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge branch 'maint-20' into maintIngela Anderton Andin2018-11-121-0/+15
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Prepare releaseErlang/OTP2018-11-092-1/+16
| | * | | | | | | | | ssl: Add engine handling clause to RSA key exchangeIngela Anderton Andin2018-11-092-1/+21
* | | | | | | | | | | Merge branch 'ingela/ssl/key-derive/OTP-15374'Ingela Anderton Andin2018-11-124-31/+412
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | ssl: Add key derivation functions for TLS-1.3Ingela Anderton Andin2018-11-094-31/+412
* | | | | | | | | | | | Merge branch 'maint'Ingela Anderton Andin2018-11-122-1/+21
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge branch 'ingela/ssl/rsa-kex-engine/ERIERL-268/OTP-15420' into maintIngela Anderton Andin2018-11-122-1/+21
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | ssl: Add engine handling clause to RSA key exchangeIngela Anderton Andin2018-11-092-1/+21
* | | | | | | | | | | | | Merge branch 'maint'Hans Nilsson2018-11-097-28/+49
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge branch 'hans/ssh/fix_ext_info_doc' into maintHans Nilsson2018-11-092-20/+19
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | ssh: Fix documentation for public key in ext_infoHans Nilsson2018-11-092-20/+19
| * | | | | | | | | | | | | ssh: Clear remote user_dir in ssh_compat_SUITEHans Nilsson2018-11-091-0/+13
| * | | | | | | | | | | | | ssh: Check compatibility with new OpenSSH versionsHans Nilsson2018-11-091-0/+6
| |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge branch 'hans/ssh/fix_ext_info/OTP-15413' into maintHans Nilsson2018-11-093-8/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | ssh: Fix ssh_options checking for ext_infoHans Nilsson2018-11-081-6/+6
| | * | | | | | | | | | | ssh: Fix SSH_MSG_EXT_INFO bug for OTP SSH as serverHans Nilsson2018-11-071-2/+1
| | * | | | | | | | | | | ssh: Fix SSH_MSG_EXT_INFO bug for OTP SSH as clientHans Nilsson2018-11-071-0/+4