commit b3129ba11930c81fb47b58d81e4c4651a24aaec6
author Victor Krasnoshchok <ct3da21164@protonmail.ch> Sat Aug 29 22:54:37 2020 +0300
committer Victor Krasnoshchok <ct3da21164@protonmail.ch> Sat Aug 29 22:54:37 2020 +0300
tree 13f4abaccc63b6414082e5ee4c02ea07f116b292
parent e79812ed4d9c3186c3e4040217143cd0419a8e4a

Refactoring after CR and new unit test #3175

Signed-off-by: Victor Krasnoshchok <ct3da21164@protonmail.ch>

library/entropy.c

diff --git a/library/entropy.c b/library/entropy.c
index 519c3ae..fd2c207 100644
--- a/library/entropy.c
+++ b/library/entropy.c
@@ -466,25 +466,32 @@
 #if defined(MBEDTLS_FS_IO)
 int mbedtls_entropy_write_seed_file( mbedtls_entropy_context *ctx, const char *path )
 {
-    int ret;
+    int ret = 0;
     FILE *f = NULL;
     unsigned char buf[MBEDTLS_ENTROPY_BLOCK_SIZE];
 
     if( ( ret = mbedtls_entropy_func( ctx, buf, MBEDTLS_ENTROPY_BLOCK_SIZE ) ) != 0 )
-        goto exit;
-
-    ret = MBEDTLS_ERR_ENTROPY_FILE_IO_ERROR;
-    if( ( f = fopen( path, "wb" ) ) != NULL )
     {
-        if( fwrite( buf, 1, MBEDTLS_ENTROPY_BLOCK_SIZE, f ) != MBEDTLS_ENTROPY_BLOCK_SIZE )
-            goto exit;
-        ret = 0;
+        ret = MBEDTLS_ERR_ENTROPY_SOURCE_FAILED;
+        goto exit;
+    }
+
+    if( ( f = fopen( path, "wb" ) ) == NULL )
+    {
+        ret = MBEDTLS_ERR_ENTROPY_FILE_IO_ERROR;
+        goto exit;
+    }
+
+    if( fwrite( buf, 1, MBEDTLS_ENTROPY_BLOCK_SIZE, f ) != MBEDTLS_ENTROPY_BLOCK_SIZE )
+    {
+        ret = MBEDTLS_ERR_ENTROPY_FILE_IO_ERROR;
+        goto exit;
     }
 
 exit:
     mbedtls_platform_zeroize( buf, sizeof( buf ) );
 
-    if( f )
+    if( f != NULL )
         fclose( f );
 
     return( ret );