diff options
| author | Gilles Peskine <Gilles.Peskine@arm.com> | 2020-02-26 19:48:43 +0100 |
|---|---|---|
| committer | Ronald Cron <ronald.cron@arm.com> | 2020-03-19 14:17:54 +0100 |
| commit | 7dc97048d65068b1577176a55b8d12bf88faa3a5 (patch) | |
| tree | ebceea64ce7414b5b65ea8fe748708ee46848e9e /configs | |
| parent | 1a9c624fcea3e2cd6fc1aa756e6ae8e2d57a9c2e (diff) | |
| download | mbedtls-7dc97048d65068b1577176a55b8d12bf88faa3a5.zip mbedtls-7dc97048d65068b1577176a55b8d12bf88faa3a5.tar.gz mbedtls-7dc97048d65068b1577176a55b8d12bf88faa3a5.tar.bz2 | |
Revert "Remove tests that depend on TLS or X.509"
This reverts commit 9afb2e992136db3fae9a669c3faaf6d5d27602a8.
Conflicts:
* include/CMakeLists.txt
* "Make config.h available" comment: there has been a change
adjacent to where it was removed. Just re-add what was removed.
* tests/CMakeLists.txt:
* compat.sh: there has been a change immediately before where it was
removed. Just re-add what was removed.
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/config-mini-tls1_1.h | 3 | ||||
| -rw-r--r-- | configs/config-thread.h | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/configs/config-mini-tls1_1.h b/configs/config-mini-tls1_1.h index d4743bb..013bc03 100644 --- a/configs/config-mini-tls1_1.h +++ b/configs/config-mini-tls1_1.h @@ -70,6 +70,9 @@ #define MBEDTLS_CERTS_C #define MBEDTLS_PEM_PARSE_C +/* For testing with compat.sh */ +#define MBEDTLS_FS_IO + #include "mbedtls/check_config.h" #endif /* MBEDTLS_CONFIG_H */ diff --git a/configs/config-thread.h b/configs/config-thread.h index f729a03..25db16b 100644 --- a/configs/config-thread.h +++ b/configs/config-thread.h @@ -75,6 +75,10 @@ #define MBEDTLS_SSL_SRV_C #define MBEDTLS_SSL_TLS_C +/* For tests using ssl-opt.sh */ +#define MBEDTLS_NET_C +#define MBEDTLS_TIMING_C + /* Save RAM at the expense of ROM */ #define MBEDTLS_AES_ROM_TABLES |