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

..

aes

Adapt programs / test suites

2014-07-09 10:19:24 +02:00

hash

Adapt programs / test suites

2014-07-09 10:19:24 +02:00

pkey

Add UDP support to the NET module

2014-10-21 16:30:09 +02:00

random

Adapt programs / test suites

2014-07-09 10:19:24 +02:00

ssl

Merge branch 'development' into dtls

2015-01-22 13:30:33 +00:00

test

Merge commit '8b9bcec' into dtls

2015-01-20 16:38:39 +00:00

util

pem2der.c: fix double-free bug

2014-08-14 11:34:34 +02:00

x509

Merge commit 'd7e2483' into dtls

2015-01-20 16:52:28 +00:00

.gitignore

Add dlts_client.c and dtls_server.c

2014-10-21 16:32:54 +02:00

CMakeLists.txt

- Added missing subdirectory line for util

2012-09-25 08:19:18 +00:00

Makefile

Add dlts_client.c and dtls_server.c

2014-10-21 16:32:54 +02:00

wince_main.c

- Lots of minimal changes to better support WINCE as a build target

2011-11-18 14:26:47 +00:00