commit 090365fe608b915643168df35ec5fb0a72244027
author Andrzej Kurek <andrzej.kurek@arm.com> Mon Jun 08 11:00:51 2020 -0400
committer Andrzej Kurek <andrzej.kurek@arm.com> Mon Jun 08 11:00:51 2020 -0400
tree 42b1c2bb29c8a4d0267897985ff8af54c7042c25
parent 478b05c34ccc5cebe1019409b61cb42da300d8ba

Improve the usage of uECC_RNG_Function

Since the mbed TLS implementation of rng wrapper returns the size of random
data generated upon success - check for it explicitly.
Signed-off-by: Andrzej Kurek <andrzej.kurek@arm.com>

tinycrypt/ecc.c

diff --git a/tinycrypt/ecc.c b/tinycrypt/ecc.c
index b3e3ed3..57b3228 100644
--- a/tinycrypt/ecc.c
+++ b/tinycrypt/ecc.c
@@ -1169,7 +1169,7 @@
 	}
 
 	for (tries = 0; tries < uECC_RNG_MAX_TRIES; ++tries) {
-		if (!g_rng_function((uint8_t *)random, num_words * uECC_WORD_SIZE)) {
+		if (g_rng_function((uint8_t *)random, num_words * uECC_WORD_SIZE) != num_words * uECC_WORD_SIZE) {
       			return 0;
     		}
 		random[num_words - 1] &=

tinycrypt/ecc_dh.c

diff --git a/tinycrypt/ecc_dh.c b/tinycrypt/ecc_dh.c
index ceabb00..a63c84b 100644
--- a/tinycrypt/ecc_dh.c
+++ b/tinycrypt/ecc_dh.c
@@ -119,7 +119,7 @@
 		/* Generating _private uniformly at random: */
 		uECC_RNG_Function rng_function = uECC_get_rng();
 		if (!rng_function ||
-			!rng_function((uint8_t *)_random, 2 * NUM_ECC_WORDS*uECC_WORD_SIZE)) {
+			rng_function((uint8_t *)_random, 2 * NUM_ECC_WORDS*uECC_WORD_SIZE) != 2 * NUM_ECC_WORDS*uECC_WORD_SIZE) {
         		return UECC_FAILURE;
 		}
 

tinycrypt/ecc_dsa.c

diff --git a/tinycrypt/ecc_dsa.c b/tinycrypt/ecc_dsa.c
index 230f689..70f9c8b 100644
--- a/tinycrypt/ecc_dsa.c
+++ b/tinycrypt/ecc_dsa.c
@@ -151,7 +151,7 @@
 		/* Generating _random uniformly at random: */
 		uECC_RNG_Function rng_function = uECC_get_rng();
 		if (!rng_function ||
-		    !rng_function((uint8_t *)_random, 2*NUM_ECC_WORDS*uECC_WORD_SIZE)) {
+		    rng_function((uint8_t *)_random, 2*NUM_ECC_WORDS*uECC_WORD_SIZE) != 2*NUM_ECC_WORDS*uECC_WORD_SIZE) {
 			return UECC_FAILURE;
 		}