Manuel Pégourié-Gonnard 3a173f497b Merge branch 'development' into dtls ... * development: Fix error code description. generate_errors.pl now errors on duplicate codes Avoid nested if's without braces. Move renego SCSV after actual ciphersuites Fix send_close_notify usage. Rename variable for clarity Improve script portability Conflicts: library/ssl_srv.c programs/ssl/ssl_client2.c programs/ssl/ssl_server2.c tests/ssl-opt.sh		2015-01-22 13:30:33 +00:00
..
data_files	Add tests for concatenated CRLs	2014-11-19 16:08:34 +01:00
scripts	Merge miscellaneous fixes into development	2015-01-13 16:04:38 +01:00
suites	Merge commit 'd7e2483' into dtls	2015-01-20 16:52:28 +00:00
.gitignore	Add test_suite_entropy	2014-06-10 15:38:44 +02:00
CMakeLists.txt	Merge commit 'd7e2483' into dtls	2015-01-20 16:52:28 +00:00
compat.sh	Merge branch 'development' into dtls	2015-01-21 13:57:33 +00:00
Descriptions.txt	Add selftest program to the list of tests	2014-04-04 16:33:01 +02:00
Makefile	Merge commit '8b9bcec' into dtls	2015-01-20 16:38:39 +00:00
ssl-opt.sh	Merge branch 'development' into dtls	2015-01-22 13:30:33 +00:00