summaryrefslogtreecommitdiff
Commit message (Collapse)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
| | | | | | | | | | | | | | | | algorithms add algorithms/0 function that returns a list off compiled in crypto algorithms and make tests suites with SHA226, SHA256, SHA384 and SHA512 conditional based on that
| * SSL: run OpenSSL tests only on cipher suites supported in OpenSSLAndreas Schultz2013-02-271-1/+17
| | | | | | | | | | | | | | Erlangs SSL app can in some cases support more TLS cipher suites that the underlying openssl version itself. So when running the openssl connection tests we need to consider not only our own capabilites, but openssl's as well.
| * 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
| | | | | | | | | | | | Some of the PSK and SRP ciphers default to sha384, this enables hash_size for that cipher. It also adds sha512 and sha224 to be prepared for further cipher enhancements.
| * 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
| | | | | | | | | | | | | | | | | | Observer table viewer crashes when attempts to display a term containing improper lists (e.g. dict). Quick way to reproduce: run ets:insert(ets:new(test,[]), {1,[h|t]}). then start observer and open test ETS in table viewer. Observer will crash.
* | | 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
| |/ / | | | | | | | | | | | | Running "open" on an HTTP URL will pass it to the system's configured default browser.
* | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In a multithread case one HTTP session is used for sending/receiving HTTP requests/responses in parallel. This causes wrong parsing of responses if Content-Length header is "0". The bug is reported to the erlang bug list: http://erlang.org/pipermail/erlang-bugs/2013-February/003391.html
* | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The package is called flymake, not flymake-mode. Also decreasing the version requirement, as erlang-flymake.el works well with version 0.3 (the one shipped with Emacs).
* | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Several people have requested that the assert macros in EUnit should be moved out to a separate header file. This patch puts them in stdlib/include/assert.hrl, which gets included by the eunit.hrl file. Thus, nothing changes for eunit users, but the asserts can now also be included separately.
* | | | | | 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
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * kostis/hipe-icode-range-bug: Fix bug related to the handling of is_number/1 by the range analysis Clean up and homogenize text messages for options OTP-10897
| * | | | | | | Fix bug related to the handling of is_number/1 by the range analysisKostis Sagonas2013-02-251-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following module produced erroneous results when compiled with HiPE: -module(a). -export([foo/1]). foo(X) when is_number(X) -> is_integer(X). Running: 1> c(a). 2> a:foo(0). true 3> hipe:c(a). 4> a:foo(0). false % *** WRONG *** The problem was that the 'number' case for the `hipe_icode:type_test/1` was going to the default case where the argument was determined as being something other than an integer. Thanks to Sebastian Egner and Johannes Weißl for bringing the bug into attention. Fixed on the day it was reported.
| * | | | | | | 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
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * sverk/halfword-loading-crash: erts: Fix crash on halfword and code_SUITE:big_boot_embedded OTP-10896
| * | | | | | | | 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
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * lukas/erts/add_ERL_MAX_PORTS_env/OTP-10895: Undo removal of ERL_MAX_PORTS os variable
| * | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * lukas/erts/default_ports_win32/OTP-10892: Update to work with new default windows max ports Set default max ports on win32 to 8192
| * | | | | | | | | 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
| |/ / / / / / / /