tree 7af26ca6f3c0478e84521940cb3d90955d316a8c
parent 23eb74d8b5eea3dabdb7b5ef53e849bd8c4b9b02
parent 11c919208de4bab3cbf6f940dc3dadb1c834ede7
author Manuel Pégourié-Gonnard <mpg@elzevir.fr> 1421933433 +0000
committer Manuel Pégourié-Gonnard <mpg@elzevir.fr> 1421933433 +0000

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