X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fsec%2Frandom_p.h;h=990925f8bdc469dab2fae2013da917069067dd81;hb=94f23fc17d4a4a56e66d76e76f23ca35c176f3a6;hp=d3e39c2fa40e9a068411794f4770c3d38381706b;hpb=281c567a202fbfbf6f1416fbae02c8e6757fddca;p=bertos.git

diff --git a/bertos/sec/random_p.h b/bertos/sec/random_p.h
index d3e39c2f..990925f8 100644
--- a/bertos/sec/random_p.h
+++ b/bertos/sec/random_p.h
@@ -47,14 +47,18 @@
 
 #define POOL_NONE       0
 #define POOL_YARROW     1
-#define POOL_NAME1      Yarrow
+#define POOL_NAMEU1     YarrowPool
+#define POOL_NAMEL1     yarrowpool
 
 #define PRNG_ISAAC      1
 #define PRNG_X917       2
 #define PRNG_YARROW     3
-#define PRNG_NAME1      ISAAC
-#define PRNG_NAME2      X917
-#define PRNG_NAME3      Yarrow
+#define PRNG_NAMEU1     Isaac
+#define PRNG_NAMEL1     isaac
+#define PRNG_NAMEU2     X917
+#define PRNG_NAMEL2     x917
+#define PRNG_NAMEU3     Yarrow
+#define PRNG_NAMEL3     yarrow
 
 #define EXTRACTOR_NONE  0
 #define EXTRACTOR_SHA1  1
@@ -63,11 +67,11 @@
 #if RANDOM_SECURITY_LEVEL == RANDOM_SECURITY_STRONG
 	#define CONFIG_RANDOM_POOL          POOL_YARROW
 	#define CONFIG_RANDOM_EXTRACTOR     EXTRACTOR_NONE   // not required with a pool
-	#define CONFIG_RANDOM_PRNG          PRNG_ISAAC   // FIXME: PRNG_YARROW
+	#define CONFIG_RANDOM_PRNG          PRNG_YARROW
 #elif RANDOM_SECURITY_LEVEL == RANDOM_SECURITY_MEDIUM
 	#define CONFIG_RANDOM_POOL          POOL_NONE
 	#define CONFIG_RANDOM_EXTRACTOR     EXTRACTOR_SHA1
-	#define CONFIG_RANDOM_PRNG          PRNG_ISAAC   // FIXME: PRNG_X917
+	#define CONFIG_RANDOM_PRNG          PRNG_X917
 #elif RANDOM_SECURITY_LEVEL == RANDOM_SECURITY_MINIMUM
 	#define CONFIG_RANDOM_POOL          POOL_NONE
 	#define CONFIG_RANDOM_EXTRACTOR     EXTRACTOR_NONE
@@ -92,19 +96,19 @@ enum EntropySource
 /*
  * Add entropy to the global entropy pool.
  */
-void random_add_entropy(enum EntropySource source_idx, 
-	   				    const uint8_t *data, size_t len,
+void random_add_entropy(enum EntropySource source_idx,
+					    const uint8_t *data, size_t len,
 						int entropy);
 
 
 /*
  * Add entropy to the global interrupt pool based on the IRQ
  * call time.
- * 
+ *
  * This function can be called from interrupt handlers that are
- * triggered at unpredictable intervals (so it should not be 
+ * triggered at unpredictable intervals (so it should not be
  * called from clock-driven interrupts like ADC, PWM, etc.).
- * 
+ *
  */
 void random_add_entropy_irq(int irq);