tree 7cfe886f3b85f8f30655c44d0309a96ce1f1280c
parent 81abefd46c7c61463644545f50fc1d975f784d10
parent 6ca762495254e88f59713421d18c55b691bf6a60
author Manuel Pégourié-Gonnard <mpg@elzevir.fr> 1433235569 +0100
committer Manuel Pégourié-Gonnard <mpg@elzevir.fr> 1433235569 +0100

Merge branch 'mbedtls-1.3' into development

* mbedtls-1.3:
  Mark unused constant as such
  Update ChangeLog for recent external bugfix
  Serious bug fix in entropy.c
  Fix memleak with repeated [gc]cm_setkey()
  fix minor bug in path_cnt checks

Conflicts:
	include/mbedtls/cipher.h
	library/ccm.c
	library/entropy.c
	library/gcm.c
	library/x509_crt.c