commit ef3cf7088f675a1336730628f233fd27de019dec
author Paul Bakker <p.j.bakker@polarssl.org> Wed Mar 26 12:51:25 2014 +0100
committer Paul Bakker <p.j.bakker@polarssl.org> Tue Jul 08 11:25:51 2014 +0200
tree f9fe4960797a21c507c97a64af506627cc4906a2
parent 1e9423704a2379228828152a2f05d123e181cf9f

Provide no info from entropy_func() on future entropy

library/entropy.c

diff --git a/library/entropy.c b/library/entropy.c
index 7409c2e..468ef03 100644
--- a/library/entropy.c
+++ b/library/entropy.c
@@ -184,11 +184,6 @@
     memset( buf, 0, ENTROPY_BLOCK_SIZE );
 
     sha4_finish( &ctx->accumulator, buf );
-                
-    /*
-     * Perform second SHA-512 on entropy
-     */
-    sha4( buf, ENTROPY_BLOCK_SIZE, buf, 0 );
 
     /*
      * Reset accumulator and counters and recycle existing entropy
@@ -197,6 +192,11 @@
     sha4_starts( &ctx->accumulator, 0 );
     sha4_update( &ctx->accumulator, buf, ENTROPY_BLOCK_SIZE );
 
+    /*
+     * Perform second SHA-512 on entropy
+     */
+    sha4( buf, ENTROPY_BLOCK_SIZE, buf, 0 );
+
     for( i = 0; i < ctx->source_count; i++ )
         ctx->source[i].size = 0;