diff options
| author | Andrzej Kurek <andrzej.kurek@mobica.com> | 2019-01-31 08:20:20 -0500 |
|---|---|---|
| committer | Andrzej Kurek <andrzej.kurek@mobica.com> | 2019-01-31 08:20:20 -0500 |
| commit | c470b6b021150788860ad9aa08202249663dbc75 (patch) | |
| tree | 5a4a5e637a81d71fa6e616d9303ba9366e5eb9dc /include/mbedtls/pem.h | |
| parent | 7b9575c654c61e9515963d92e045a7fdc2a668cb (diff) | |
| download | mbedtls-c470b6b021150788860ad9aa08202249663dbc75.zip mbedtls-c470b6b021150788860ad9aa08202249663dbc75.tar.gz mbedtls-c470b6b021150788860ad9aa08202249663dbc75.tar.bz2 | |
Merge development commit 8e76332 into development-psa
Additional changes to temporarily enable running tests:
ssl_srv.c and test_suite_ecdh use mbedtls_ecp_group_load instead of
mbedtls_ecdh_setup
test_suite_ctr_drbg uses mbedtls_ctr_drbg_update instead of
mbedtls_ctr_drbg_update_ret
Diffstat (limited to 'include/mbedtls/pem.h')
| -rw-r--r-- | include/mbedtls/pem.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/mbedtls/pem.h b/include/mbedtls/pem.h index fa82f7b..a29e9ce 100644 --- a/include/mbedtls/pem.h +++ b/include/mbedtls/pem.h @@ -24,6 +24,12 @@ #ifndef MBEDTLS_PEM_H #define MBEDTLS_PEM_H +#if !defined(MBEDTLS_CONFIG_FILE) +#include "config.h" +#else +#include MBEDTLS_CONFIG_FILE +#endif + #include <stddef.h> /** |