aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl
AgeCommit message (Collapse)Author
2013-01-08Merge branch 'ia/ssl/TLS-1.2-default/OTP-10425'Ingela Anderton Andin
* ia/ssl/TLS-1.2-default/OTP-10425: ssl: Make TLS-1.2 default version
2012-12-20ssl: Make TLS-1.2 default versionIngela Anderton Andin
2012-12-19ssl & orber: Remove ssl:pid/1 (has been pointless since R14)Ingela Anderton Andin
2012-12-19ssl: Fix update of test case name in init funtionIngela Anderton Andin
2012-12-06Merge branch 'maint'Ingela Anderton Andin
Conflicts: erts/emulator/sys/vxworks/sys.c erts/vsn.mk lib/ssl/src/ssl_connection.erl lib/ssl/test/ssl_basic_SUITE.erl
2012-12-06Update release notesErlang/OTP
2012-12-06ssl: Prepare for releaseIngela Anderton Andin
2012-12-06ssl: Export sslsocket() dialyzer typeIngela Anderton Andin
2012-12-06ssl: Cancel non expired timersIngela Anderton Andin
2012-12-06ssl: Fix recv after timeout expiredIngela Anderton Andin
Reset state so that "recv data" is not sent as "active data" after a recv timed out and no new recv has been called.
2012-12-06ssl: Timeout handling changed so that the fsm-process will terminate if the ↵Ingela Anderton Andin
ssl:ssl_accept/[2,3] or ssl:connect/[3,4] timeout expires. Add missing function clause to handle timeout during handshake. The missing clause had the effect that the timeout was wrongly discarded. Also add an extra test case for the recv timeout in addition to the one in ssl_packet_SUITE. The missing functions clause was introduced in 8a789189. This commit changed the timeout implementation, the previous implememtation could cause other type of problems as the timeout was client side.
2012-11-28Merge branch 'ia/ssl/sslv2-tests'Ingela Anderton Andin
* ia/ssl/sslv2-tests: ssl: Receive port EXIT-message so that it does not get mixed up with the protocol-error message we are expecting
2012-11-27Merge tag 'OTP_R15B03'Björn-Egil Dahlberg
The R15B03 release
2012-11-27ssl: Receive port EXIT-message so that it does not get mixed up with the ↵Ingela Anderton Andin
protocol-error message we are expecting
2012-11-27Merge branch 'ia/ssl/peer-cert-server'Ingela Anderton Andin
* ia/ssl/peer-cert-server: ssl: Add test case for ssl:peercert with client certification
2012-11-27ssl: Add and enhance testsIngela Anderton Andin
2012-11-27ssl: Consider new server options when resuming a sessionIngela Anderton Andin
If an ssl server is restarted with new options and a client tries to reuse a session the server must make sure that it complies to the new options before agreeing to reuse it.
2012-11-27Merge branch 'ia/ssl/make-depend/OTP-10594'Ingela Anderton Andin
* ia/ssl/make-depend/OTP-10594: ssl: Add dependencies to Makefile
2012-11-26Prepare releaseOTP_R15B03Erlang/OTP
2012-11-26ssl: Add dependencies to MakefileIngela Anderton Andin
2012-11-26Fix other applicationsBjörn Gustavsson
2012-11-22ssl: Add test case for ssl:peercert with client certificationIngela Anderton Andin
2012-11-21Merge branch 'as/ssl-sha224-fixes'Henrik Nord
* as/ssl-sha224-fixes: SSL: TLS 1.2, advertise sha224 support OTP-10586
2012-11-19Merge remote branch 'upstream/maint'Ingela Anderton Andin
2012-11-19ssl: Fix bug in match expression found by DialyzerIngela Anderton Andin
Code should handle case the there is some undelivered data left on the socket when peer close signal is received. It is unlikely that this happens during normal testing.
2012-11-18SSL: TLS 1.2, advertise sha224 supportAndreas Schultz
SHA-224 is still better than SHA-1, so let the world know we support it
2012-11-15Merge remote branch 'upstream/maint'Ingela Anderton Andin
2012-11-14ssl: Update vsn.mk and ssl.appup.src for releaseIngela Anderton Andin
2012-11-14Merge remote branch 'upstream/maint'Ingela Anderton Andin
Conflicts: lib/ssl/src/ssl_connection.erl
2012-11-13ssl: Make sure that the ssl connection process will not hang in terminate ↵Ingela Anderton Andin
function. Avoid doing gen_tcp/inet socket operations in terminate if socket is already closed. Call gen_tcp:recv/3 in the "data delivery workaround" to avoid hanging.
2012-11-13ssl: Add default values to emulated socket options in internal recordIngela Anderton Andin
The absence of the active default values could cause a process leak
2012-11-12ssl: Adopt test case to not take so longIngela Anderton Andin
2012-11-09Merge remote branch 'upstream/maint'Ingela Anderton Andin
* upstream/maint: ssl: Do not use gen_fsm:sync_send_all_state_event/3 timeout
2012-11-09ssl: Do not use gen_fsm:sync_send_all_state_event/3 timeoutIngela Anderton Andin
The gen_fsm:sync_send_all_state_event/3 timout is a client side timeout. If timeouts are needed we want them to be server side timeouts.
2012-10-05Merge branch 'ia/ssl/controlling-process-on-listen-socket/OTP-10447'Ingela Anderton Andin
* ia/ssl/controlling-process-on-listen-socket/OTP-10447: ssl: Improve #sslsocket{} API ssl: It is now possible to call controlling_process on a listen socket, same as in gen_tcp.
2012-10-01ssl: Better test to determine if sslv2 is supported by opensslIngela Anderton Andin
2012-10-01ssl: Improve #sslsocket{} APIIngela Anderton Andin
A #sslsocket{} contains the fsm pid and value that was previously set to old_ssl or new_ssl to make the transition period smoother. Now that old ssl is not supported any more we use this field to store the inet socket reference instead. This enables some API functions to return quicker as they do not need to communicate with the fsm-process.
2012-10-01ssl: It is now possible to call controlling_process on a listen socket,Ingela Anderton Andin
same as in gen_tcp. Made error handling of listen sockets as arguments to funtions expecting a connected socket more inet/gen_tcp like.
2012-09-27Merge branch 'ia/ssl/npn/OTP-10361'Ingela Anderton Andin
* ia/ssl/npn/OTP-10361: ssl: Shorten test case names to workaround ct shortcomings on windows ssl: SSL 3.0 does not support next protocol negotiation ssl: Dialyzer fixes and code cleaning ssl: Changed default behaviour of next protocol negotiation to make more "sense" (be true to the specification). ssl: Update SSL docs for SSL Next Protocol Support ssl: Support for SSL Next Protocol Negotiation * http://technotes.googlecode.com/git/nextprotoneg.html
2012-09-26ssl: Shorten test case names to workaround ct shortcomings on windowsIngela Anderton Andin
2012-09-25ssl: Adopt test case to not take so longIngela Anderton Andin
2012-09-21ssl: SSL 3.0 does not support next protocol negotiationIngela Anderton Andin
Also shorten test cases names to workaround test framework problems on windows
2012-09-20ssl: Dialyzer fixes and code cleaningIngela Anderton Andin
Types in a record where wrongly type specified, did not include undefined. Make them comments for now, maybe we will specify internal records with dialyzer types later, but as the other record fields are not specified at the moment, with dialyzer types, make the code consistent.
2012-09-20ssl: Changed default behaviour of next protocol negotiation to makeIngela Anderton Andin
more "sense" (be true to the specification).
2012-09-20ssl: Update SSL docs for SSL Next Protocol SupportBen Murphy
2012-09-20ssl: Support for SSL Next Protocol NegotiationBen Murphy
* http://technotes.googlecode.com/git/nextprotoneg.html
2012-09-03Prepare releaseOTP_R15B02Erlang/OTP
2012-08-31Update copyright yearsBjörn-Egil Dahlberg
2012-08-29Merge branch 'ta/docsmaint' into maintHenrik Nord
* ta/docsmaint: Fix various doc typos for R15B02 Fix various code typos for R15B02 OTP-10245
2012-08-27ssl: Fixed compilation warningsIngela Anderton Andin