summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'maint'John Högberg2021-10-152-1/+17
|\
| * Merge branch 'john/erts/fix-huge-line-number-crash/OTP-17712' into maintJohn Högberg2021-10-152-1/+17
| |\
| | * erts: Fix crash on exceptions with huge line numbersJohn Högberg2021-10-142-1/+17
* | | Merge branch 'maint'Ingela Anderton Andin2021-10-153-12/+44
|\ \ \ | |/ /
| * | Merge branch 'ingela/ssl/interop-PSS-TLS-1.2/GH-5255/OTP-17688' into maintIngela Anderton Andin2021-10-153-12/+44
| |\ \
| | * | ssl: Add guard for possible future algorithms not beeing handled as legacyIngela Anderton Andin2021-10-141-1/+6
| | * | ssl: Add OpenSSL interop testsIngela Anderton Andin2021-10-141-2/+2
| | * | ssl: Fix filter and conversions of singnature algorithms schemes for TLS-1.2Ingela Anderton Andin2021-10-142-7/+34
| | * | ssl: Fix Authority to not become empty in pre TLS-1.3 CertificateRequestIngela Anderton Andin2021-10-131-2/+2
* | | | Merge branch 'john/compiler/remove-r21-code'John Högberg2021-10-145-41/+20
|\ \ \ \
| * | | | compiler: Remove some vestigial code for OTP 21 supportJohn Högberg2021-10-075-41/+20
* | | | | Merge branch 'maint'Sverker Eriksson2021-10-141-1/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #5263 from dszoboszlay/fix-incorrect-inlining-attributeDan Gudmundsson2021-10-141-1/+1
| |\ \ \ \
| | * | | | Fix syntax for inlining a functionDániel Szoboszlay2021-10-051-1/+1
* | | | | | Merge pull request #5270 from frej/frej/pch-raceJohn Högberg2021-10-131-1/+2
|\ \ \ \ \ \
| * | | | | | Fix race related to precompiled header during compilationFrej Drejhammar2021-10-071-1/+2
* | | | | | | Merge branch 'maint'Cons T Åhs2021-10-132-35/+248
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge branch 'cons/ssh/connect-informative-error/OTP-17515' into maintCons T Åhs2021-10-132-35/+248
| |\ \ \ \ \ \
| | * | | | | | [ssh] Add better error handling in connect/2,3,4Cons T Åhs2021-10-122-35/+248
* | | | | | | | Merge branch 'maint'Sverker Eriksson2021-10-121-1/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch 'sverker/asan_logs_to_html-fix' into maintSverker Eriksson2021-10-121-1/+2
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Fix asan_logs_to_html regexSverker Eriksson2021-10-041-1/+2
* | | | | | | | Merge branch 'maint'Cons T Åhs2021-10-125-188/+294
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge pull request #5269 from lisztspace/cons/httpc-accept-binary-headers/GH-...Cons T Åhs2021-10-125-188/+294
| |\ \ \ \ \ \ \
| | * | | | | | | [httpc] Allow binary() header values in request/5Cons T Åhs2021-10-114-187/+293
| | * | | | | | | Fix typoCons T Åhs2021-10-071-1/+1
| | | |_|_|_|_|/ | | |/| | | | |
* | | | | | | | Merge branch 'maint'Hans Nilsson2021-10-121-0/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch 'hans/crypto/cuddle_tests' into maintHans Nilsson2021-10-121-0/+3
| |\ \ \ \ \ \ \
| | * | | | | | | ssh: Exclude LibreSSL 2.1.* from Engine testsHans Nilsson2021-10-121-0/+3
| |/ / / / / / /
* | | | | | | | Merge branch 'maint'Hans Nilsson2021-10-121-0/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch 'hans/crypto/error_refactor/OTP-17241' into maintHans Nilsson2021-10-121-0/+5
| |\ \ \ \ \ \ \
| | * | | | | | | crypto: Silence CodeCheckerHans Nilsson2021-10-071-0/+5
* | | | | | | | | Merge branch 'maint'Björn Gustavsson2021-10-121-2/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge branch 'bjorn/erts/fortify-bs_add/OTP-17686' into maintBjörn Gustavsson2021-10-121-2/+2
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Improve argument testing in the bs_add instructionBjörn Gustavsson2021-10-081-2/+2
| | | |/ / / / / / | | |/| | | | | |
* | | | | | | | | Merge branch 'maint'Ingela Anderton Andin2021-10-110-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge branch 'ingela/ssl/interop-PSS-TLS-1.2/GH-5255/OTP-17688' into maintIngela Anderton Andin2021-10-110-0/+0
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| | * | | | | | | ssl: Fix algorithm typoIngela Anderton Andin2021-10-111-1/+1
* | | | | | | | | Merge branch 'maint'Ingela Anderton Andin2021-10-110-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge branch 'ingela/ssl/algo-typo-in-OTP-17688' into maintIngela Anderton Andin2021-10-110-0/+0
| |\ \ \ \ \ \ \ \
| | * | | | | | | | ssl: Fix algorithm typoIngela Anderton Andin2021-10-111-1/+1
| | |/ / / / / / /
* | | | | | | | | Merge branch 'maint'Ingela Anderton Andin2021-10-111-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge branch 'ingela/ssl/algo-typo-in-OTP-17688' into maintIngela Anderton Andin2021-10-111-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | ssl: Fix algorithm typoIngela Anderton Andin2021-10-111-1/+1
| |/ / / / / / / /
* | | | | | | | | Merge branch 'maint'Ingela Anderton Andin2021-10-116-118/+172
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge pull request #5277 from IngelaAndin/ingela/ssl/interop-PSS-TLS-1.2/GH-5...Ingela Andin2021-10-116-118/+172
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | ssl: Move ssl application exports upIngela Anderton Andin2021-10-081-65/+70
| | * | | | | | | ssl: Fix TLS-1.2 RSASSA-PSS negotiationIngela Anderton Andin2021-10-086-53/+102
| | |/ / / / / /
* | | | | | | | Merge branch 'maint'Lukas Larsson2021-10-0810-406/+696
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | / | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Merge pull request #5197 from garazdawi/lukas/erl_docgen/make-docs-more-respo...Lukas Larsson2021-10-0810-406/+696
| |\ \ \ \ \ \