Skip to content

Commit 6cde4ef

Browse files
committed
Added checks for platforms with no entropy source
1 parent 093c243 commit 6cde4ef

File tree

1 file changed

+24
-15
lines changed

1 file changed

+24
-15
lines changed

features/mbedtls/platform/inc/mbedtls_config_reader.h

Lines changed: 24 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#ifndef __MBEDTLS_CONFIG_READER_H__
1919
#define __MBEDTLS_CONFIG_READER_H__
2020

21+
#include "platform/inc/platform_mbed.h"
2122

2223
// This first section is checking the values from mbed_app.json and
2324
// mbedtls/mbed_lib.json and setting the appropriate defines for them
@@ -412,38 +413,46 @@
412413
#define MBEDTLS_SHA256_C
413414
#define MBEDTLS_HAVE_TIME
414415
#define MBEDTLS_REMOVE_ARC4_CIPHERSUITES
415-
#define MBEDTLS_SSL_TLS_C
416416
#define MBEDTLS_CIPHER_C
417417
#define MBEDTLS_MD_C
418418
#define MBEDTLS_ERROR_STRERROR_DUMMY
419-
#define MBEDTLS_NO_PLATFORM_ENTROPY
420-
#define MBEDTLS_SSL_EXTENDED_MASTER_SECRET
421-
#define MBEDTLS_SSL_PROTO_TLS1_2
422419
#define MBEDTLS_X509_CHECK_KEY_USAGE
423420
#define MBEDTLS_X509_CHECK_EXTENDED_KEY_USAGE
424421
#define MBEDTLS_VERSION_C
425422
#define MBEDTLS_SELF_TEST
426423
#define MBEDTLS_PK_RSA_ALT_SUPPORT
427-
#define MBEDTLS_SSL_ALL_ALERT_MESSAGES
428-
#define MBEDTLS_SSL_ENCRYPT_THEN_MAC
429-
#define MBEDTLS_SSL_RENEGOTIATION
430-
#define MBEDTLS_SSL_MAX_FRAGMENT_LENGTH
431-
#define MBEDTLS_SSL_PROTO_DTLS
432-
#define MBEDTLS_SSL_ALPN
433-
#define MBEDTLS_SSL_DTLS_ANTI_REPLAY
434-
#define MBEDTLS_SSL_DTLS_HELLO_VERIFY
435-
#define MBEDTLS_SSL_DTLS_CLIENT_PORT_REUSE
436-
#define MBEDTLS_SSL_DTLS_BADMAC_LIMIT
437424
#define MBEDTLS_SSL_SESSION_TICKETS
438-
#define MBEDTLS_SSL_EXPORT_KEYS
439425
#define MBEDTLS_VERSION_FEATURES
440426
#define MBEDTLS_CTR_DRBG_C
441427
#define MBEDTLS_DEBUG_C
442428
#define MBEDTLS_ERROR_C
443429
#define MBEDTLS_HMAC_DRBG_C
430+
431+
432+
#if defined(MBEDTLS_ENTROPY_HARDWARE_ALT) || defined(MBEDTLS_TEST_NULL_ENTROPY) || \
433+
defined(MBEDTLS_ENTROPY_NV_SEED)
434+
435+
#define MBEDTLS_NO_PLATFORM_ENTROPY
436+
#define MBEDTLS_SSL_ALL_ALERT_MESSAGES
437+
#define MBEDTLS_SSL_ALPN
444438
#define MBEDTLS_SSL_CACHE_C
445439
#define MBEDTLS_SSL_COOKIE_C
446440
#define MBEDTLS_SSL_CLI_C
441+
#define MBEDTLS_SSL_DTLS_ANTI_REPLAY
442+
#define MBEDTLS_SSL_DTLS_BADMAC_LIMIT
443+
#define MBEDTLS_SSL_DTLS_CLIENT_PORT_REUSE
444+
#define MBEDTLS_SSL_DTLS_HELLO_VERIFY
445+
#define MBEDTLS_SSL_ENCRYPT_THEN_MAC
446+
#define MBEDTLS_SSL_EXPORT_KEYS
447+
#define MBEDTLS_SSL_EXTENDED_MASTER_SECRET
448+
#define MBEDTLS_SSL_MAX_FRAGMENT_LENGTH
449+
#define MBEDTLS_SSL_PROTO_DTLS
450+
#define MBEDTLS_SSL_PROTO_TLS1_2
451+
#define MBEDTLS_SSL_RENEGOTIATION
452+
#define MBEDTLS_SSL_TLS_C
453+
454+
#endif // #if defined(MBEDTLS_ENTROPY_HARDWARE_ALT) || defined(MBEDTLS_TEST_NULL_ENTROPY) || defined(MBEDTLS_ENTROPY_NV_SEED)
455+
447456

448457
// finally, let any file referred to with mbedtls.app-config-file override
449458
// any of the other selections

0 commit comments

Comments
 (0)