tree 109026624b292e7bcff980d17a15e2ab026b0f68
parent edb7ed3a438acb02aa96478ccec4a63343f0747b
parent f6080b8557f74fb02805c9ea5e16521c8c89d15f
author Manuel Pégourié-Gonnard <mpg@elzevir.fr> 1421840673 +0000
committer Manuel Pégourié-Gonnard <mpg@elzevir.fr> 1421841273 +0000

Merge commit 'f6080b8' into dtls

* commit 'f6080b8':
  Fix warning in reduced configs
  Adapt to "negative" switch for renego
  Add tests for periodic renegotiation
  Make renego period configurable
  Auto-renegotiate before sequence number wrapping
  Update Changelog for compile-option renegotiation
  Switch from an enable to a disable flag
  Save 48 bytes if SSLv3 is not defined
  Make renegotiation a compile-time option
  Add tests for renego security enforcement

Conflicts:
	include/polarssl/ssl.h
	library/ssl_cli.c
	library/ssl_srv.c
	library/ssl_tls.c
	programs/ssl/ssl_server2.c
	tests/ssl-opt.sh