commit 7a9899f1bd24e1cc9680943cf44a64471dfac42a
author Gilles Peskine <gilles.peskine@arm.com> Tue Nov 12 19:45:13 2019 +0100
committer GitHub <noreply@github.com> Tue Nov 12 19:45:13 2019 +0100
tree 2971591cb3c9dcf92c26b4fca3678bd68b09a816
parent cb0101ff33f2b66e1f6ba5476ae3e5ce515cfaeb
parent 006c1b5f4e8dd2da632ddd5df97f1b5ec9163734

Merge pull request #284 from gilles-peskine-arm/bk-warning-fixes-crypto

Fix some possibly-undefined variable warnings

library/entropy.c

diff --git a/library/entropy.c b/library/entropy.c
index f8db1a5..d7091cb 100644
--- a/library/entropy.c
+++ b/library/entropy.c
@@ -258,7 +258,9 @@
  */
 static int entropy_gather_internal( mbedtls_entropy_context *ctx )
 {
-    int ret, i, have_one_strong = 0;
+    int ret = MBEDTLS_ERR_ENTROPY_SOURCE_FAILED;
+    int i;
+    int have_one_strong = 0;
     unsigned char buf[MBEDTLS_ENTROPY_MAX_GATHER];
     size_t olen;
 

library/hmac_drbg.c

diff --git a/library/hmac_drbg.c b/library/hmac_drbg.c
index 284c9b4..f71c95c 100644
--- a/library/hmac_drbg.c
+++ b/library/hmac_drbg.c
@@ -74,7 +74,7 @@
     unsigned char rounds = ( additional != NULL && add_len != 0 ) ? 2 : 1;
     unsigned char sep[1];
     unsigned char K[MBEDTLS_MD_MAX_SIZE];
-    int ret;
+    int ret = MBEDTLS_ERR_MD_BAD_INPUT_DATA;
 
     for( sep[0] = 0; sep[0] < rounds; sep[0]++ )
     {