tree 80fd54ca4da7a52e1597a662a50ca3cab5084ffe
parent 8fbb01ec849eb5301303c781e7b3a58fd54b4fd5
parent 9835bc077a8880ec28c5aa27ca91f35cd480ec10
author Manuel Pégourié-Gonnard <mpg@elzevir.fr> 1421847736 +0000
committer Manuel Pégourié-Gonnard <mpg@elzevir.fr> 1421847736 +0000

Merge commit '9835bc0' into dtls

* commit '9835bc0':
  Fix racy test.
  Fix stupid error in previous commit
  Don't check errors on ssl_close_notify()
  Fix char signedness issue
  Fix issue with non-blocking I/O & record splitting
  Fix warning

Conflicts:
	programs/ssl/ssl_client2.c
	programs/ssl/ssl_server2.c