tree a3289e6ed330b749e586c3b1a7b265c1e7efd6af
parent da61ed334685e35762dd188b4a8eb3bb08f95d9b
parent fa950c94804fb5c93989b5ca62a60b3b6eb6e414
author Manuel Pégourié-Gonnard <mpg@elzevir.fr> 1430394745 +0200
committer Manuel Pégourié-Gonnard <mpg@elzevir.fr> 1430394745 +0200

Merge branch 'mbedtls-1.3' into development

* mbedtls-1.3:
  fix bug in ssl_mail_client
  Adapt compat.sh to GnuTLS 3.4
  Fix undefined behaviour in x509

Conflicts:
	programs/ssl/ssl_mail_client.c
	tests/compat.sh