Fix bug in randpool_stir and randpool_add. Typos.

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@773 38d2e660-2303-0410-9eaa-f027e97ec537

diff --git a/algos/randpool.c b/algos/randpool.c
index b2d91727c6bb7162fe008edf0966a04af24e52c4..69be610d3aa2c2c2363dc3e387ba647726d96f30 100755 (executable)
--- a/algos/randpool.c
+++ b/algos/randpool.c
@@ -13,6 +13,9 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.7  2007/02/09 15:49:54  asterix
+ *#* Fix bug in randpool_stir and randpool_add. Typos.
+ *#*
  *#* Revision 1.6  2007/02/09 09:24:38  asterix
  *#* Typos. Add data_len in randpool_add and n_byte in randpool_push pototypes.
  *#*
@@ -37,7 +40,7 @@
  * Insert bytes in entropy pool, making a XOR of bytes present
  * in entropy pool.
  */
-static void randpool_push(EntrPool *pool, void *_byte, size_t n_byte)
+static void randpool_push(EntropyPool *pool, void *_byte, size_t n_byte)
 {
        size_t i = pool->pos_add; // Current number of byte insert in entropy pool.
        uint8_t *byte;
@@ -60,9 +63,9 @@ static void randpool_push(EntrPool *pool, void *_byte, size_t n_byte)
 /**
  * Add n_bit of  entropy in entropy pool.
  */
-void randpool_add(EntrPool *pool, void *data, size_t data_len, size_t entropy)
+void randpool_add(EntropyPool *pool, void *data, size_t data_len, size_t entropy)
 {
-       uint32_t event = timer_clock();
+       ticks_t event = timer_clock();
        uint32_t delta;
        uint8_t sep[] = "\xaa\xaa\xaa\xaa";  // ??
 
@@ -88,7 +91,7 @@ void randpool_add(EntrPool *pool, void *data, size_t data_len, size_t entropy)
                entropy++;
        }
 
-       pool->entropy = entropy;      //Update a entropy of the pool.
+       pool->entropy += entropy;      //Update a entropy of the pool.
        pool->last_counter = event;
 }
 
@@ -96,31 +99,31 @@ void randpool_add(EntrPool *pool, void *data, size_t data_len, size_t entropy)
  * This function stir entropy pool with MD2 function hash.
  *
  */
-static void randpool_stir(EntrPool *pool)
+static void randpool_stir(EntropyPool *pool)
 {
        size_t entropy = pool->entropy; //Save current calue of entropy.
        Md2Context context;
-       uint8_t tmp_buf[(sizeof(size_t) * 2) + sizeof(int)];  //Temporary buffer.
+       uint8_t tmp_buf[((sizeof(size_t) * 2) + sizeof(int)) * 2]; //Temporary buffer.
 
-       md2_init(&context);
+       md2_init(&context); //Init MD2 algorithm.
 
        randpool_add(pool, "", 0, 0);
 
-       for (int i = 0; i < (CONFIG_SIZE_ENTROPY_POOL / CONFIG_MD2_BLOCK_LEN); i++)
+       for (int i = 0; i < NUM_STIR_LOOP; i++)
        {
-               sprintf(tmp_buf, "%x%x%x",pool->counter, i, pool->pos_add);
+               sprintf(tmp_buf, "%0x%0x%0x",pool->counter, i, pool->pos_add);
 
                /*
                 * Hash with MD2 algorithm the entropy pool.
                 */
                md2_update(&context, pool->pool_entropy, CONFIG_SIZE_ENTROPY_POOL);
 
-               md2_update(&context, tmp_buf, CONFIG_SIZE_ENTROPY_POOL);
+               md2_update(&context, tmp_buf, strlen(tmp_buf));
 
                /*Insert a message digest in entropy pool.*/
                randpool_push(pool, md2_end(&context), CONFIG_MD2_BLOCK_LEN);
 
-               pool->counter = (pool->counter + 1) & 0xFFFFFFFF; //Update a counter modulo 4.
+               pool->counter = (pool->counter + 1) & 0xFFFFFFFF; //Clamp a counter to 4 byte.
 
        }
 
@@ -131,10 +134,10 @@ static void randpool_stir(EntrPool *pool)
 }
 
 
-void randpool_init(EntrPool *pool)
+void randpool_init(EntropyPool *pool)
 {
 
-       memset(pool, 0, sizeof(EntrPool));
+       memset(pool, 0, sizeof(EntropyPool));
        pool->pos_get = CONFIG_MD2_BLOCK_LEN;
        pool->last_counter = timer_clock();
 
@@ -145,17 +148,17 @@ void randpool_init(EntrPool *pool)
 /**
  * Get the actual value of entropy.
  */
-size_t randpool_size(EntrPool *pool)
+size_t randpool_size(EntropyPool *pool)
 {
        return pool->entropy;
 }
 
-void randpool_get(EntrPool *pool, void *data, size_t n_byte)
+void randpool_get(EntropyPool *pool, void *data, size_t n_byte)
 {
 
 }
 
-void randpool_getN(EntrPool *pool, void *data, size_t n_byte)
+void randpool_getN(EntropyPool *pool, void *data, size_t n_byte)
 {
 }
 

diff --git a/algos/randpool.h b/algos/randpool.h
index 7556494337e3cf2a7a369835aef13d30c0916da4..98acb03f0fb4d00e33ba64607591f3e43c56ad58 100755 (executable)
--- a/algos/randpool.h
+++ b/algos/randpool.h
@@ -14,6 +14,9 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.6  2007/02/09 15:49:54  asterix
+ *#* Fix bug in randpool_stir and randpool_add. Typos.
+ *#*
  *#* Revision 1.5  2007/02/09 09:24:38  asterix
  *#* Typos. Add data_len in randpool_add and n_byte in randpool_push pototypes.
  *#*
@@ -24,7 +27,7 @@
  *#* Typos.
  *#*
  *#* Revision 1.2  2007/02/08 11:53:03  asterix
- *#* Add EntrPool struct. Typos.
+ *#* Add EntropyPool struct. Typos.
  *#*
  *#* Revision 1.1  2007/02/08 11:13:41  asterix
  *#* Add function prototypes.
@@ -37,26 +40,28 @@
 #include <cfg/compiler.h>
 #include <appconfig.h>
 
+#define NUM_STIR_LOOP  CONFIG_SIZE_ENTROPY_POOL / CONFIG_MD2_BLOCK_LEN
+
 /**
  * Sturct data of entropy pool.
  */
-typedef struct EntrPool 
+typedef struct EntropyPool 
 {
        size_t entropy;                                  ///< Actual value of entropy (byte).
-       size_t pos_add;                                  ///< Size of byte insert in entropy pool.
-       size_t pos_get;                                  ///< Size of byte take in entropy pool.
+       size_t pos_add;                                  ///< Number of byte  idd in entropy pool.
+       size_t pos_get;                                  ///< Number of byte get in entropy pool.
        size_t counter;                                  ///< Counter.
        size_t last_counter;                             ///< Last timer value.
        uint8_t pool_entropy[CONFIG_SIZE_ENTROPY_POOL];  ///< Entropy pool.
 
-} EntrPool;
+} EntropyPool;
 
 
-void randpool_add(EntrPool *pool, void *data, size_t data_len, size_t entropy);
-void randpool_init(EntrPool *pool);
-size_t randpool_size(EntrPool *pool);
-void randpool_get(EntrPool *pool, void *data, size_t n_byte);
-void randpool_getN(EntrPool *pool, void *data, size_t n_byte);
+void randpool_add(EntropyPool *pool, void *data, size_t data_len, size_t entropy);
+void randpool_init(EntropyPool *pool);
+size_t randpool_size(EntropyPool *pool);
+void randpool_get(EntropyPool *pool, void *data, size_t n_byte);
+void randpool_getN(EntropyPool *pool, void *data, size_t n_byte);
 bool randpool_save(void *data);
 uint8_t *randpool_load(void);