aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Expand)Author
2019-06-17Merge branch 'maint'John Högberg
2019-06-17Merge branch 'john/erts/fix-conservative/OTP-15881' into maintJohn Högberg
2019-06-17Merge branch 'maint'Rickard Green
2019-06-17Merge branch 'rickard/dist-exit2/22/OTP-15867' into maintRickard Green
2019-06-17Merge branch 'maint'John Högberg
2019-06-17Merge branch 'john/kernel/fix-io-proto-user-drv/OTP-15805' into maintJohn Högberg
2019-06-17Merge branch 'bjorn/better-fun-info/OTP-15837'Björn Gustavsson
2019-06-17Merge branch 'maint'Björn Gustavsson
2019-06-17cc.sh: Optimize dependency generationBjörn Gustavsson
2019-06-17Merge branch 'maint'Ingela Anderton Andin
2019-06-17Merge pull request #2206 from alehar/inets/httpd_request_parse_headers_fixIngela Andin
2019-06-17Merge branch 'maint'Ingela Anderton Andin
2019-06-17Merge branch 'ingela/merge-294' into maintIngela Anderton Andin
2019-06-17Merge branch 'ingela/raimo/udp-send-TOS/ERIERL-294/OTP-15747' into ingela/mer...Ingela Anderton Andin
2019-06-17Merge branch 'maint'Hans Nilsson
2019-06-17Merge branch 'hans/crypto/cuddle_docs' into maintHans Nilsson
2019-06-17crypto: Modernized 'Algorithms' section in User's GuideHans Nilsson
2019-06-17Merge branch 'rickard/dist-exit2/21/OTP-15867' into rickard/dist-exit2/22/OTP...Rickard Green
2019-06-17Merge branch 'maint'Ingela Anderton Andin
2019-06-17Merge branch 'ingela/public_key/PEBS2-backport/OTP-15870' into maintIngela Anderton Andin
2019-06-17Merge branch 'rickard/dist-exit2/20/OTP-15867' into rickard/dist-exit2/21/OTP...Rickard Green
2019-06-17public_key: Add AES to PBE2Ingela Anderton Andin
2019-06-17Don't disconnect on remote exit/2 with old incarnation as recipientRickard Green
2019-06-17Introduce udp send ancillary data argument down to inet_drvRaimo Niskanen
2019-06-17Fix old warningsRaimo Niskanen
2019-06-17Merge branch 'john/kernel/fix-io-proto-user-drv/OTP-15805'John Högberg
2019-06-17Create a shared wrapper function for all occurrences of 'fun F/A'Björn Gustavsson
2019-06-17Merge branch 'maint'Péter Dimitrov
2019-06-17Merge branch 'peterdmv/ssl/tls12-java11-interop/ERL-973/OTP-15887' into maintPéter Dimitrov
2019-06-17Merge branch 'maint'John Högberg
2019-06-17Merge branch 'maint-20' into maintJohn Högberg
2019-06-17Merge branch 'maint'Siri Hansen
2019-06-17Merge branch 'siri/ct/fail-after-failed-init_per_testcase/maint-21/ERIERL-350...Siri Hansen
2019-06-17[ct] Allow post_init_per_testcase to change skip to failSiri Hansen
2019-06-17Merge branch 'maint'Lukas Larsson
2019-06-17Merge pull request #2289 from gomoripeti/doc_message_in_traceLukas Larsson
2019-06-16Document extra message element also where trace message format is describedPéter Gömöri
2019-06-14ssl: Add interop testPéter Dimitrov
2019-06-14ssl: Improve handling of signature algorithmsPéter Dimitrov
2019-06-14Merge branch 'maint'Hans Nilsson
2019-06-14Merge branch 'hans/crypto/unified_xMAC/OTP-13872' into maintHans Nilsson
2019-06-14crypto: DocumentationHans Nilsson
2019-06-14crypto: Enable MAC key length checking in mac-tableHans Nilsson
2019-06-14crypto: Renaming, typing and some polishingHans Nilsson
2019-06-14crypto: Begin test of the new mac interface directly.Hans Nilsson
2019-06-14crypto: Move mac compatibility functions to hmac.c and cmac.cHans Nilsson
2019-06-14crypto: Move functions around for better readabilityHans Nilsson
2019-06-14crypto: White space removed at line endsHans Nilsson
2019-06-14crypto: Use dirty schedulers for mac_updateHans Nilsson
2019-06-14crypto: Implement NIFs for the new mac_init, mac_update and mac_finalHans Nilsson