Remove tag files.

[bertos.git] / bertos / sec / random.c

diff --git a/bertos/sec/random.c b/bertos/sec/random.c
index 421688dc553f515bb5fe966065a3c7be3442e8f9..67c24859529d9a2daee538418b0e8f3a7b062083 100644 (file)
--- a/bertos/sec/random.c
+++ b/bertos/sec/random.c
@@ -1,3 +1,40 @@
+/**
+ * \file
+ * <!--
+ * This file is part of BeRTOS.
+ *
+ * Bertos is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * As a special exception, you may use this file as part of a free software
+ * library without restriction.  Specifically, if other files instantiate
+ * templates or use macros or inline functions from this file, or you compile
+ * this file and link it with other files to produce an executable, this
+ * file does not by itself cause the resulting executable to be covered by
+ * the GNU General Public License.  This exception does not however
+ * invalidate any other reasons why the executable file might be covered by
+ * the GNU General Public License.
+ *
+ * Copyright 2010 Develer S.r.l. (http://www.develer.com/)
+ *
+ * -->
+ *
+ * \brief High-level random number generation functions.
+ * \author Giovanni Bajo <rasky@develer.com>
+ *
+ */
+
 #include "random.h"
 #include "random_p.h"
 
@@ -9,18 +46,21 @@
 #include <sec/util.h>
 #include <sec/hash/sha1.h>
 #include <sec/prng/isaac.h>
+#include <sec/prng/x917.h>
+#include <sec/prng/yarrow.h>
+#include <sec/entropy/yarrow_pool.h>
 
 /********************************************************************************/
 /* Configuration of the random module                                           */
 /********************************************************************************/
 
-#define POOL_CONTEXT          PP_CAT(PP_CAT(PRNG_NAME, CONFIG_RANDOM_POOL), _Context)
-#define POOL_INIT             PP_CAT(PP_CAT(PRNG_NAME, CONFIG_RANDOM_POOL), _init)
+#define POOL_CONTEXT          PP_CAT(PP_CAT(POOL_NAMEU, CONFIG_RANDOM_POOL), Context)
+#define POOL_INIT             PP_CAT(PP_CAT(POOL_NAMEL, CONFIG_RANDOM_POOL), _init)
 
 #define EXTRACTOR_STACKINIT   PP_CAT(PP_CAT(EXTRACTOR_NAME, CONFIG_RANDOM_EXTRACTOR), _stackinit)
 
-#define PRNG_CONTEXT          PP_CAT(PP_CAT(PRNG_NAME, CONFIG_RANDOM_PRNG), _Context)
-#define PRNG_INIT             PP_CAT(PP_CAT(PRNG_NAME, CONFIG_RANDOM_PRNG), _init)
+#define PRNG_CONTEXT          PP_CAT(PP_CAT(PRNG_NAMEU, CONFIG_RANDOM_PRNG), Context)
+#define PRNG_INIT             PP_CAT(PP_CAT(PRNG_NAMEL, CONFIG_RANDOM_PRNG), _init)
 
 
 /********************************************************************************/
@@ -29,7 +69,7 @@
 
 #if CONFIG_RANDOM_POOL != POOL_NONE
 static POOL_CONTEXT epool_ctx;
-static EntropyPool_Context * const epool = (EntropyPool_Context *)&epool_ctx;
+static EntropyPool * const epool = (EntropyPool *)&epool_ctx;
 #endif
 
 static PRNG_CONTEXT prng_ctx;
@@ -44,11 +84,11 @@ static bool initialized = 0;
 
 /*
  * Reseed the PRNG if there is enough entropy available at this time.
- * 
- * Some designs (eg: fortuna) suggest to artificially limit the frequency of 
+ *
+ * Some designs (eg: fortuna) suggest to artificially limit the frequency of
  * this operation to something like 0.1s, to avoid attacks that try to exhaust
  * the entropy pool.
- * 
+ *
  * We don't believe such attacks are available in an embedded system (as an attacker
  * does not have a way to ask random numbers from the pool) but we will play safe
  * here in case eg. the user does something wrong.
@@ -56,21 +96,21 @@ static bool initialized = 0;
 static void optional_reseeding(void)
 {
 #if CONFIG_RANDOM_POOL != POOL_NONE
-       static ticks_t last_reseed = 0;
+       static ticks_t last_reseed = -1000;
 
-       // We don't allow more than 10 reseedings per second 
+       // We don't allow more than 10 reseedings per second
        // (as suggested by Fortuna)
        ticks_t current = timer_clock();
        if (ticks_to_ms(current - last_reseed) < 100)
                return;
-       
+
        if (entropy_seeding_ready(epool))
        {
                uint8_t seed[prng_seed_len(prng)];
-               
+
                entropy_make_seed(epool, seed, sizeof(seed));
                prng_reseed(prng, seed);
-               
+
                last_reseed = current;
                PURGE(seed);
        }
@@ -80,7 +120,7 @@ static void optional_reseeding(void)
 
 /*
  * Perform the initial seeding of the PRNG.
- * 
+ *
  * At startup, we want to immediately seed the PRNG to a point where it can
  * generate safe-enough random numbers. To do this, we rely on a hw-dependent
  * function to pull entropy from available hw sources, and then feed it
@@ -97,7 +137,7 @@ static void initial_seeding(void)
                random_pull_entropy(buf, sizeof(buf));
                entropy_add(epool, 0, buf, sizeof(buf), sizeof(buf)*8);
        } while (!entropy_seeding_ready(epool));
-       
+
        optional_reseeding();
 
 #elif CONFIG_RANDOM_EXTRACTOR != EXTRACTOR_NONE