Use entropy injection on any NVseed platform or PSA dual-core/v8

Oren Cohen · Oren Cohen · commit 51a462aeea00 · 2018-12-05T20:08:35.000+02:00
diff --git a/TESTS/mbed-crypto/sanity/main.cpp b/TESTS/mbed-crypto/sanity/main.cpp
@@ -30,7 +30,7 @@
 
 using namespace utest::v1;
 
-#ifdef MBEDTLS_ENTROPY_NV_SEED
+#if defined(MBEDTLS_ENTROPY_NV_SEED) || defined(COMPONENT_PSA_SRV_IPC)
 
 #if !defined(MAX)
 #define MAX(a,b) (((a)>(b))?(a):(b))
@@ -47,7 +47,7 @@ void inject_entropy()
     }
     mbedtls_psa_inject_entropy(seed, MBEDTLS_PSA_INJECT_ENTROPY_MIN_SIZE);
 }
-#endif
+#endif // defined(MBEDTLS_ENTROPY_NV_SEED) || defined(COMPONENT_PSA_SRV_IPC)
 
 void test_crypto_random(void)
 {
@@ -297,12 +297,12 @@ void test_crypto_key_derivation(void)
 utest::v1::status_t case_setup_handler(const Case *const source, const size_t index_of_case)
 {
     psa_status_t status = psa_crypto_init();
-#if defined(MBEDTLS_ENTROPY_NV_SEED)
+#if defined(MBEDTLS_ENTROPY_NV_SEED) || defined(COMPONENT_PSA_SRV_IPC)
     if (status == PSA_ERROR_INSUFFICIENT_ENTROPY) {
         inject_entropy();
         status = psa_crypto_init();
     }
-#endif /* MBEDTLS_ENTROPY_NV_SEED */
+#endif /* defined(MBEDTLS_ENTROPY_NV_SEED) || defined(COMPONENT_PSA_SRV_IPC) */
     TEST_ASSERT_EQUAL(PSA_SUCCESS, status);
     return greentea_case_setup_handler(source, index_of_case);
 }

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@`
`30`	`30`
`31`	`31`	`using namespace utest::v1;`
`32`	`32`
`33`		`-#ifdef MBEDTLS_ENTROPY_NV_SEED`
	`33`	`+#if defined(MBEDTLS_ENTROPY_NV_SEED) \|\| defined(COMPONENT_PSA_SRV_IPC)`
`34`	`34`
`35`	`35`	`#if !defined(MAX)`
`36`	`36`	`#define MAX(a,b) (((a)>(b))?(a):(b))`
`@@ -47,7 +47,7 @@ void inject_entropy()`
`47`	`47`	`}`
`48`	`48`	`mbedtls_psa_inject_entropy(seed, MBEDTLS_PSA_INJECT_ENTROPY_MIN_SIZE);`
`49`	`49`	`}`
`50`		`-#endif`
	`50`	`+#endif // defined(MBEDTLS_ENTROPY_NV_SEED) \|\| defined(COMPONENT_PSA_SRV_IPC)`
`51`	`51`
`52`	`52`	`void test_crypto_random(void)`
`53`	`53`	`{`
`@@ -297,12 +297,12 @@ void test_crypto_key_derivation(void)`
`297`	`297`	`utest::v1::status_t case_setup_handler(const Case *const source, const size_t index_of_case)`
`298`	`298`	`{`
`299`	`299`	`psa_status_t status = psa_crypto_init();`
`300`		`-#if defined(MBEDTLS_ENTROPY_NV_SEED)`
	`300`	`+#if defined(MBEDTLS_ENTROPY_NV_SEED) \|\| defined(COMPONENT_PSA_SRV_IPC)`
`301`	`301`	`if (status == PSA_ERROR_INSUFFICIENT_ENTROPY) {`
`302`	`302`	`inject_entropy();`
`303`	`303`	`status = psa_crypto_init();`
`304`	`304`	`}`
`305`		`-#endif /* MBEDTLS_ENTROPY_NV_SEED */`
	`305`	`+#endif /* defined(MBEDTLS_ENTROPY_NV_SEED) \|\| defined(COMPONENT_PSA_SRV_IPC) */`
`306`	`306`	`TEST_ASSERT_EQUAL(PSA_SUCCESS, status);`
`307`	`307`	`return greentea_case_setup_handler(source, index_of_case);`
`308`	`308`	`}`