Merge remote-tracking branch 'upstream-public/pr/1081' into mbedtls-1.3

This commit is contained in:
Gilles Peskine 2017-11-28 18:40:10 +01:00
commit 43a6b83419
2 changed files with 7 additions and 0 deletions

View file

@ -23,6 +23,8 @@ Bugfix
If a call to one of the functions of the cryptographic primitive modules
failed, the error may not be noticed by the function pem_read_buffer()
causing it to return invalid values. Found by Guido Vranken. #756
* Include configuration file in md.h, to fix compilation warnings.
Reported by aaronmdjones in #1001
= mbed TLS 1.3.21 branch released 2017-08-10

View file

@ -27,6 +27,11 @@
#define POLARSSL_MD_H
#include <stddef.h>
#if !defined(POLARSSL_CONFIG_FILE)
#include "config.h"
#else
#include POLARSSL_CONFIG_FILE
#endif
#if ( defined(__ARMCC_VERSION) || defined(_MSC_VER) ) && \
!defined(inline) && !defined(__cplusplus)