random: integrate the random module into the wizard

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

diff --git a/bertos/cfg/cfg_random.h b/bertos/cfg/cfg_random.h
new file mode 100644 (file)
index 0000000..5e3afdf
--- /dev/null
+++ b/bertos/cfg/cfg_random.h
@@ -0,0 +1,65 @@
+/**
+ * \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 2011 Develer S.r.l. (http://www.develer.com/)
+ *
+ * -->
+ *
+ * \author Andrea Righi <arighi@develer.com>
+ *
+ * \brief Configuration file for the "random" module
+ */
+
+#ifndef CFG_RANDOM_H
+#define CFG_RANDOM_H
+
+/**
+ * Module logging level.
+ *
+ * $WIZ$ type = "enum"
+ * $WIZ$ value_list = "log_level"
+ */
+#define RANDOM_LOG_LEVEL      LOG_LVL_INFO
+
+/**
+ * module logging format.
+ *
+ * $WIZ$ type = "enum"
+ * $WIZ$ value_list = "log_format"
+ */
+#define RANDOM_LOG_FORMAT     LOG_FMT_TERSE
+
+/**
+ * Random security level.
+ *
+ * $WIZ$ type = "enum"
+ * $WIZ$ value_list = "random_level"
+ */
+#define RANDOM_SECURITY_LEVEL          RANDOM_SECURITY_MINIMUM
+
+#endif /* CFG_RANDOM_H */

diff --git a/bertos/sec/prng/isaac.c b/bertos/sec/prng/isaac.c
index f3320a5469fbe3ff426a2e566d1b7ab527bf34f0..6c0ddc1cb3f453550da79bad842431d17a71dfcb 100644 (file)
--- a/bertos/sec/prng/isaac.c
+++ b/bertos/sec/prng/isaac.c
@@ -48,6 +48,7 @@ MODIFIED:
 
 #include "isaac.h"
 #include <sec/prng.h>
+#include <sec/util.h>
 #include <cfg/compiler.h>
 #include <cfg/macros.h>
 #include <string.h>

diff --git a/bertos/sec/random.h b/bertos/sec/random.h
index 04f570bb1de93517507ea52b4d289bf096cf4351..cd103e704c09b59d7e91ea0e74e4a3442a80de0d 100644 (file)
--- a/bertos/sec/random.h
+++ b/bertos/sec/random.h
@@ -33,18 +33,21 @@
  * \brief High-level random number generation functions.
  * \author Giovanni Bajo <rasky@develer.com>
  *
+ * $WIZ$ module_name = "random"
+ * $WIZ$ module_configuration = "bertos/cfg/cfg_random.h"
+ * $WIZ$ module_supports = "stm32 or lm3s"
  */
 
 #ifndef SEC_RANDOM_H
 #define SEC_RANDOM_H
 
+#include "cfg/cfg_random.h"
 #include <cfg/compiler.h>
 
-#define RANDOM_SECURITY_MINIMUM        0
-#define RANDOM_SECURITY_MEDIUM         1
-#define RANDOM_SECURITY_STRONG         2
-
 /**
+ * \name Security level definition
+ *
+ *
  * Configure the security level required by the application.
  *
  * Application developers are suggested to keep the strongest
@@ -74,9 +77,14 @@
  *     random numbers. Even if the generator is still secure on
  *     paper, its seeding will not be safe (though still entropic
  *     to allow different sequences to be generated after each reset).
+ *
+ * $WIZ$ random_level = "RANDOM_SECURITY_MINIMUM", "RANDOM_SECURITY_MEDIUM", "RANDOM_SECURITY_STRONG"
+ * \{
  */
-#define RANDOM_SECURITY_LEVEL          RANDOM_SECURITY_STRONG
-
+#define RANDOM_SECURITY_MINIMUM        0
+#define RANDOM_SECURITY_MEDIUM         1
+#define RANDOM_SECURITY_STRONG         2
+/** \} */
 
 void random_init(void);