Merge remote-tracking branch 'public/pr/2138' into mbedtls-2.7-restricted-proposed

This commit is contained in:
Simon Butcher 2018-11-07 13:34:42 +00:00
commit 9136dab9c3

View file

@ -40,7 +40,6 @@
#include "mbedtls/x509_crt.h"
#include "mbedtls/oid.h"
#include <stdio.h>
#include <string.h>
#if defined(MBEDTLS_PEM_PARSE_C)
@ -50,6 +49,7 @@
#if defined(MBEDTLS_PLATFORM_C)
#include "mbedtls/platform.h"
#else
#include <stdio.h>
#include <stdlib.h>
#define mbedtls_free free
#define mbedtls_calloc calloc