summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'as/tls-psk-srp-suites-ECC' into master-pumaster-puFredrik Gustafsson2013-02-2838-550/+5381
|\
| * SSL: add Elliptic Curve ciphers unit testsAndreas Schultz2013-02-273-16/+228
| * SSL: add Elliptic Curve support for ssl appAndreas Schultz2013-02-279-43/+877
| * SSL: filter TLS cipher suites for supported algorithmsAndreas Schultz2013-02-273-35/+90
| * PUBLIC_KEY: add support for Elliptic Curves to public_key appAndreas Schultz2013-02-2712-56/+441
| * CRYPTO: add support for Elliptic Curves to crypto appAndreas Schultz2013-02-274-4/+1144
| * SSL: replace sha256_mac() tests with crypto:algorithms()Andreas Schultz2013-02-272-18/+2
| * CRYPTO: add algorithms/0 function that returns a list off compiled in crypto ...Andreas Schultz2013-02-274-374/+246
| * SSL: run OpenSSL tests only on cipher suites supported in OpenSSLAndreas Schultz2013-02-271-1/+17
| * SSL: add documentation for PSK and SRP ciphers optionsAndreas Schultz2013-02-271-0/+46
| * SSL: enable hash_size values for sha224, sha384 and sha512Andreas Schultz2013-02-271-7/+7
| * SSL: add tests for PSK and SRP ciphersAndreas Schultz2013-02-272-3/+108
| * SSL: add TLS-SRP (RFC 5054) cipher suitesAndreas Schultz2013-02-2712-25/+964
| * CRYPTO: add support for RFC-2945 SRP-3 and RFC-5054 SRP-6a authenticationAndreas Schultz2013-02-274-1/+535
| * SSL: add TLS PSK (RFC 4279 and RFC 5487) cipher suitesAndreas Schultz2013-02-279-16/+725
* | Merge branch 'ats/observer_tv_improper_lists' into master-puFredrik Gustafsson2013-02-281-1/+3
|\ \
| * | Fix observer table viewer crash on formatting improper listsAndrey Tsirulev2013-02-161-1/+3
* | | Merge branch 'mh/cdv-osx-default-browser' into master-puFredrik Gustafsson2013-02-281-2/+3
|\ \ \
| * | | Use "open" as default browser for crashdump viewer on Mac OS XMagnus Henoch2013-02-151-2/+3
| |/ /
* | | Merge branch 'an/http11_content_length_zero' into master-puFredrik Gustafsson2013-02-281-1/+15
|\ \ \
| * | | Fix the bug in HTTP/1.1 reponse with Content-Length:0Anton Nikitin2013-02-131-1/+15
* | | | Merge branch 'mh/fix-emacs-pkg-flymake-dep' into master-puFredrik Gustafsson2013-02-281-1/+1
|\ \ \ \
| * | | | Fix Flymake dependency in erlang-pkg.elMagnus Henoch2013-02-091-1/+1
* | | | | Merge branch 'rc/break-out-asserts' into master-puFredrik Gustafsson2013-02-286-193/+267
|\ \ \ \ \
| * | | | | Break out the assert macros in eunit.hrl to stdlib/include/assert.hrlRichard Carlsson2013-01-286-193/+267
* | | | | | Merge branch 'sk/odbc64' into master-puFredrik Gustafsson2013-02-284-2/+88
|\ \ \ \ \ \
| * | | | | | explain postgres pecularity for param query out parametersRaimo Niskanen2013-01-172-4/+22
| * | | | | | postgresql test case for 64bit bug for param_querySatoshi Kinoshita2013-01-102-1/+23
| * | | | | | rollback disabling scrollable_cursors for oracleSatoshi Kinoshita2013-01-101-6/+1
| * | | | | | drop procedure after testingSatoshi Kinoshita2013-01-101-0/+2
| * | | | | | set scrollable_cursors to off for oracle driverSatoshi Kinoshita2013-01-101-1/+6
| * | | | | | drop procedure after testingSatoshi Kinoshita2013-01-101-0/+3
| * | | | | | test case for stored procedure with (32bit) integer out params on 64bit platformSatoshi Kinoshita2013-01-102-1/+42
| * | | | | | odbcserver 64bit bug for SQL_C_SLONG typeSatoshi Kinoshita2013-01-101-1/+1
* | | | | | | Merge branch 'dg/win_icon' into master-puFredrik Gustafsson2013-02-281-0/+0
|\ \ \ \ \ \ \
| * | | | | | | add hires images to windows application iconDaniel Goertzen2012-09-071-0/+0
* | | | | | | | Merge branch 'maint'Björn-Egil Dahlberg2013-02-270-0/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Update version numbers for R16B01 developmentBjörn-Egil Dahlberg2013-02-273-4/+4
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Update version numbers for R17A developmentBjörn-Egil Dahlberg2013-02-273-4/+4
|/ / / / / / /
* | | | | | | Prepare releaseOTP_R16BErlang/OTP2013-02-2541-21/+1134
* | | | | | | Merge branch 'kostis/hipe-icode-range-bug'Sverker Eriksson2013-02-252-7/+9
|\ \ \ \ \ \ \
| * | | | | | | Fix bug related to the handling of is_number/1 by the range analysisKostis Sagonas2013-02-251-0/+2
| * | | | | | | Clean up and homogenize text messages for optionsKostis Sagonas2013-02-251-7/+7
* | | | | | | | Merge branch 'sverk/halfword-loading-crash'Sverker Eriksson2013-02-251-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | erts: Fix crash on halfword and code_SUITE:big_boot_embeddedSverker Eriksson2013-02-251-2/+2
* | | | | | | | | Merge branch 'lukas/erts/add_ERL_MAX_PORTS_env/OTP-10895'Lukas Larsson2013-02-251-0/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Undo removal of ERL_MAX_PORTS os variableLukas Larsson2013-02-251-0/+6
| |/ / / / / / / /
* | | | | | | | | Merge branch 'lukas/erts/default_ports_win32/OTP-10892'Lukas Larsson2013-02-253-1/+22
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update to work with new default windows max portsLukas Larsson2013-02-251-1/+9
| * | | | | | | | | Set default max ports on win32 to 8192Lukas Larsson2013-02-252-0/+13
| |/ / / / / / / /