summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* ssl: Refactor of OTP 22 code due to patch OTP-15823Ingela Anderton Andin2019-05-142-27/+16
* Merge branch 'ingela/ssl/flow-ctrl/ERL-934/ERL-938/OTP-15823' into maintIngela Anderton Andin2019-05-145-46/+221
|\
| * ssl: Avoid dialyzer warningIngela Anderton Andin2019-05-091-2/+2
| * ssl: Add test cases for issue reported in ERL-938Ingela Anderton Andin2019-05-081-0/+157
| * ssl: Internal active n must back off when user does not read dataIngela Anderton Andin2019-05-081-35/+55
| * ssl: Remove legacy calls to next_recordIngela Anderton Andin2019-05-083-20/+14
| * Revert "ssl: Add check when to toggle internal active N"Ingela Anderton Andin2019-05-071-9/+7
* | Merge branch 'john/tools/fix-cover-register-race/ERL-943/OTP-15813' into maintJohn Högberg2019-05-142-14/+53
|\ \
| * | cover: Fix register/2 race on startupJohn Högberg2019-05-132-15/+56
* | | Prepare releaseErlang/OTP2019-05-1067-97/+1433
* | | Merge branch 'maint'Rickard Green2019-05-091-0/+33
|\ \ \
| * \ \ Merge tag 'OTP-21.3.7.1' into maintRickard Green2019-05-091-0/+33
| |\ \ \
| | * | | Prepare releaseRickard Green2019-05-092-1/+34
* | | | | Merge branch 'ingela/ssl/revert-ctrl-flow'Ingela Anderton Andin2019-05-091-9/+7
|\ \ \ \ \
| * | | | | Revert "ssl: Add check when to toggle internal active N"Ingela Anderton Andin2019-05-071-9/+7
* | | | | | Merge branch 'raimo/inet_crypto_dist'Raimo Niskanen2019-05-082-371/+583
|\ \ \ \ \ \
| * | | | | | Rekey also the shared secretRaimo Niskanen2019-05-081-97/+145
| * | | | | | Use shared secret to rekeyRaimo Niskanen2019-05-031-5/+16
| * | | | | | Cycle the keypair by time and countRaimo Niskanen2019-05-031-17/+34
| * | | | | | Set socket buffer sizes to avoid handshake deadlockRaimo Niskanen2019-05-031-11/+22
| * | | | | | Keep the keypair for the node's lifetimeRaimo Niskanen2019-04-181-39/+86
| * | | | | | Implement some kind of PEKE to get forward secrecyRaimo Niskanen2019-04-171-185/+190
| * | | | | | Use incrementing IVRaimo Niskanen2019-04-091-24/+30
| * | | | | | Use Erlang cookie as shared secretRaimo Niskanen2019-04-032-278/+345
* | | | | | | Merge branch 'maint'Rickard Green2019-05-0813-11/+196
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | / / / / | | |/ / / / | |/| | | |
| * | | | | Fix bad merge from maint-21Rickard Green2019-05-082-519/+60
| * | | | | Merge branch 'maint-21' into maintIngela Anderton Andin2019-05-0714-11/+655
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Prepare releaseErlang/OTP2019-05-0614-10/+197
| | * | | | Merge branch 'siri/ct/safe-write-log-cache/ERIERL-342/OTP-15758' into maint-21Erlang/OTP2019-05-061-4/+10
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'siri/ct/reset_curr_tc/ERIERL-334/OTP-15717' into maint-21Erlang/OTP2019-05-0610-40/+903
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'siri/ct/fuzzer_support/ERIERL-143/OTP-14746' into maint-21Erlang/OTP2019-05-0616-150/+1762
| | |\ \ \ \ \ \
| | | * | | | | | [ct] Remove deprecated call to erlang:get_stacktrace()Siri Hansen2019-05-061-11/+7
| | * | | | | | | Merge branch 'raimo/stdlib/gen_statem-sync-timer-cancel/OTP-15295' into maint-21Erlang/OTP2019-05-061-147/+83
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'ingela/ssl/backported-ssl-enhancments/ERL-929/ERL-893/PR-2215/O...Erlang/OTP2019-05-0615-468/+423
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'ingela/ssl/flow-ctrl/ERL-934/OTP-15802' into maint-21Erlang/OTP2019-05-061-7/+9
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / | | |/| | | | | | | |
* | | | | | | | | | | Merge branch 'ingela/ssl/openssl-test-cuddle'Ingela Anderton Andin2019-05-071-1/+7
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | ssl: Add necessary compliance checkIngela Anderton Andin2019-05-061-1/+7
* | | | | | | | | | | | Merge branch 'ingela/ssl/dialyzer-fix'Ingela Anderton Andin2019-05-071-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | ssl: Fix dialyzer specIngela Anderton Andin2019-05-071-1/+1
* | | | | | | | | | | | | Merge branch 'sverker/ei_set_compal_rel-doc'Sverker Eriksson2019-05-071-19/+37
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | erl_interface: Document ei_set_compat_relSverker Eriksson2019-05-031-19/+37
* | | | | | | | | | | | | | Merge branch 'hasse/stdlib/optimize_io_format/OTP-15705'Hans Bolinder2019-05-074-77/+143
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | stdlib: Optimize pretty printing of strings with chars_limitHans Bolinder2019-05-032-38/+108
| * | | | | | | | | | | | | stdlib: Optimize printing of maps a bitHans Bolinder2019-05-031-6/+17
| * | | | | | | | | | | | | stdlib: Optimize pretty printing of lists slightlyHans Bolinder2019-05-031-33/+18
* | | | | | | | | | | | | | Merge branch 'ingela/ssl/cipher-suite-conversion/ERL-924/OTP-15483'Ingela Anderton Andin2019-05-075-53/+328
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | ssl: Add cipher suite convertion functionsIngela Anderton Andin2019-05-075-53/+328
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'lukas/kernel/inet_db_fix_set_of_non-existing_file/OTP-15806'Lukas Larsson2019-05-072-4/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | kernel: Fix setting of non-existing file as inet_db resolv_confLukas Larsson2019-05-062-4/+6
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'dgud/mnesia/pr-2216/OTP-15084'Dan Gudmundsson2019-05-072-4/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \ \