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
This commit is contained in:
Manuel Pégourié-Gonnard
2015-06-02 09:59:29 +01:00
3 changed files with 7 additions and 3 deletions

View File

@@ -279,6 +279,8 @@ Features
ciphersuite/certificate.
Bugfix
* Fix bug in entropy.c when THREADING_C is also enabled that caused
entropy_free() to crash (found and fixed by ptahpeteh).
* Stack buffer overflow if ctr_drbg_update() is called with too large
add_len (found by Jean-Philippe Aumasson) (not triggerable remotely).
* Possible buffer overflow of length at most POLARSSL_MEMORY_ALIGN_MULTIPLE