tree 57f5a68ec277779497f89a095f507b90fafd8a5e
parent 8a81e84638c17592d4fd3c3eac60875eaa2c06d2
parent 7b12492c7704e3688c2f39ccd443ae2443a1264c
author Manuel Pégourié-Gonnard <mpg@elzevir.fr> 1430382531 +0200
committer Manuel Pégourié-Gonnard <mpg@elzevir.fr> 1430383124 +0200

Merge branch 'mbedtls-1.3' into development

* mbedtls-1.3:
  Include changes from the 1.2 branch
  Remove unused headers in o_p_test
  Add countermeasure against cache-based lucky 13
  Make results of (ext)KeyUsage accessible
  Fix missing NULL check in MPI
  Fix detection of getrandom()
  Fix "make install" handling of symlinks
  Fix bugs in programs displaying verify flags

Conflicts:
	Makefile
	include/polarssl/ssl.h
	library/entropy_poll.c
	library/ssl_srv.c
	library/ssl_tls.c
	programs/test/o_p_test.c
	programs/test/ssl_cert_test.c
	programs/x509/cert_app.c