1
0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-08-07 06:42:56 +03:00

Merge pull request #198 from gilles-peskine-arm/psa-api-1.0-beta-merge_development_20190801

Merge mbed-crypto/development into psa-api-1.0-beta
This commit is contained in:
Gilles Peskine
2019-08-08 10:24:53 +02:00
committed by GitHub
185 changed files with 1241 additions and 937 deletions

View File

@@ -38,7 +38,7 @@
/* Include the Mbed TLS configuration file, the way Mbed TLS does it
* in each of its header files. */
#if !defined(MBEDTLS_CONFIG_FILE)
#include "../mbedtls/config.h"
#include "mbedtls/config.h"
#else
#include MBEDTLS_CONFIG_FILE
#endif