From 5e615954460b48f828c99e03166687f0a91668dc Mon Sep 17 00:00:00 2001
From: asterix <asterix@38d2e660-2303-0410-9eaa-f027e97ec537>
Date: Tue, 5 Oct 2010 09:29:31 +0000
Subject: [PATCH] Some fix to compile run test check.

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@4404 38d2e660-2303-0410-9eaa-f027e97ec537
---
 bertos/sec/cipher/blowfish_test.c |  2 +-
 bertos/sec/hash/md5.c             |  4 +-
 bertos/sec/hash/ripemd_test.c     |  3 +-
 bertos/sec/kdf/pbkdf2.h           |  4 +-
 bertos/sec/kdf/pbkdf2_test.c      | 61 ++++++++++++++++++++++++++-----
 bertos/sec/mac/hmac.h             |  1 +
 bertos/sec/mac/hmac_test.c        |  2 +-
 test/run_tests.sh                 |  9 +++++
 8 files changed, 70 insertions(+), 16 deletions(-)

diff --git a/bertos/sec/cipher/blowfish_test.c b/bertos/sec/cipher/blowfish_test.c
index 5a2ba230..ab60babc 100644
--- a/bertos/sec/cipher/blowfish_test.c
+++ b/bertos/sec/cipher/blowfish_test.c
@@ -26,7 +26,7 @@
  * invalidate any other reasons why the executable file might be covered by
  * the GNU General Public License.
  *
- * Copyright 2006 Develer S.r.l. (http://www.develer.com/)
+ * Copyright 2010 Develer S.r.l. (http://www.develer.com/)
  *
  * -->
  *
diff --git a/bertos/sec/hash/md5.c b/bertos/sec/hash/md5.c
index 8e89907b..306bacc0 100644
--- a/bertos/sec/hash/md5.c
+++ b/bertos/sec/hash/md5.c
@@ -37,7 +37,7 @@ static void byteReverse(uint32_t *buf, unsigned longs)
 static void MD5_begin(Hash *h)
 {
 	MD5_Context *ctx = (MD5_Context *)h;
-	
+
     ctx->buf[0] = 0x67452301;
     ctx->buf[1] = 0xefcdab89;
     ctx->buf[2] = 0x98badcfe;
@@ -136,7 +136,7 @@ static uint8_t* MD5_final(struct Hash *h)
 	PURGE(ctx->in);
 	PURGE(ctx->bits);
 
-	return ctx->buf;
+	return (uint8_t *)ctx->buf;
 }
 
 
diff --git a/bertos/sec/hash/ripemd_test.c b/bertos/sec/hash/ripemd_test.c
index 4fe5428c..5c3c0512 100644
--- a/bertos/sec/hash/ripemd_test.c
+++ b/bertos/sec/hash/ripemd_test.c
@@ -1,8 +1,9 @@
 
+#include "ripemd.h"
+
 #include <cfg/test.h>
 #include <cfg/debug.h>
 
-#include "RIPEMD.h"
 #include <string.h>
 
 int RIPEMD_testSetup(void)
diff --git a/bertos/sec/kdf/pbkdf2.h b/bertos/sec/kdf/pbkdf2.h
index 43d44d18..3a313711 100644
--- a/bertos/sec/kdf/pbkdf2.h
+++ b/bertos/sec/kdf/pbkdf2.h
@@ -32,7 +32,7 @@
  *
  * \brief PBKDF2 implementation
  * \author Giovanni Bajo <rasky@develer.com>
- * 
+ *
  */
 
 #ifndef SEC_KDF_PBKDF2_H
@@ -41,7 +41,7 @@
 #include <sec/kdf.h>
 #include <sec/mac.h>
 
-typedef struct 
+typedef struct
 {
 	Kdf kdf;
 	Mac *mac;
diff --git a/bertos/sec/kdf/pbkdf2_test.c b/bertos/sec/kdf/pbkdf2_test.c
index 326817cb..f5f726f7 100644
--- a/bertos/sec/kdf/pbkdf2_test.c
+++ b/bertos/sec/kdf/pbkdf2_test.c
@@ -1,10 +1,53 @@
-#include <string.h>
-#include <cpu/detect.h>
+/**
+ * \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 PBKDF2 testsuite
+ * \author Giovanni Bajo <rasky@develer.com>
+ *
+ */
+
+
+#include "pbkdf2.h"
+
 #include <cfg/test.h>
 #include <cfg/debug.h>
+
 #include <sec/mac/hmac.h>
 #include <sec/hash/sha1.h>
-#include <sec/kdf/pbkdf2.h>
+
+#include <cpu/detect.h>
+
+#include <string.h>
+
 
 int PBKDF2_testSetup(void)
 {
@@ -19,25 +62,25 @@ int PBKDF2_testTearDown(void)
 
 int PBKDF2_testRun(void)
 {
-	Kdf *kdf = PBKDF2_stackinit(HMAC_stackinit(SHA1_stackinit()));
+	Kdf *kdf = PBKDF2_stackinit(hmac_stackinit(SHA1_stackinit()));
 
 	uint8_t res[32];
-	
+
 	PBKDF2_set_iterations(kdf, 1);
 	kdf_begin(kdf, "password", 8, (const uint8_t*)"salt", 4);
 	kdf_read(kdf, res, 20);
 	ASSERT(memcmp(res, "\x0c\x60\xc8\x0f\x96\x1f\x0e\x71\xf3\xa9\xb5\x24\xaf\x60\x12\x06\x2f\xe0\x37\xa6", 20) == 0);
-	
+
 	PBKDF2_set_iterations(kdf, 2);
 	kdf_begin(kdf, "password", 8, (const uint8_t*)"salt", 4);
 	kdf_read(kdf, res, 20);
 	ASSERT(memcmp(res, "\xea\x6c\x01\x4d\xc7\x2d\x6f\x8c\xcd\x1e\xd9\x2a\xce\x1d\x41\xf0\xd8\xde\x89\x57", 20) == 0);
-	
+
 	PBKDF2_set_iterations(kdf, 4096);
 	kdf_begin(kdf, "password", 8, (const uint8_t*)"salt", 4);
 	kdf_read(kdf, res, 20);
-	ASSERT(memcmp(res, "\x4b\x00\x79\x01\xb7\x65\x48\x9a\xbe\xad\x49\xd9\x26\xf7\x21\xd0\x65\xa4\x29\xc1", 20) == 0);	
-	
+	ASSERT(memcmp(res, "\x4b\x00\x79\x01\xb7\x65\x48\x9a\xbe\xad\x49\xd9\x26\xf7\x21\xd0\x65\xa4\x29\xc1", 20) == 0);
+
 #if CPU_X86
 	// Too slow for an embedded system...
 	PBKDF2_set_iterations(kdf, 16777216);
diff --git a/bertos/sec/mac/hmac.h b/bertos/sec/mac/hmac.h
index 038c4575..8e0b3573 100644
--- a/bertos/sec/mac/hmac.h
+++ b/bertos/sec/mac/hmac.h
@@ -40,6 +40,7 @@
 
 #include <sec/mac.h>
 #include <sec/hash.h>
+
 #include <alloca.h>
 
 typedef struct HmacContext
diff --git a/bertos/sec/mac/hmac_test.c b/bertos/sec/mac/hmac_test.c
index a5edc460..1e89aae2 100644
--- a/bertos/sec/mac/hmac_test.c
+++ b/bertos/sec/mac/hmac_test.c
@@ -173,4 +173,4 @@ int hmac_testRun(void)
 	return 0;
 }
 
-TEST_MAIN(HMAC);
+TEST_MAIN(hmac);
diff --git a/test/run_tests.sh b/test/run_tests.sh
index 9a479899..9419451d 100755
--- a/test/run_tests.sh
+++ b/test/run_tests.sh
@@ -65,7 +65,16 @@ SRC_LIST="
 	bertos/io/kblock_ram.c
 	bertos/io/kblock_posix.c
 	bertos/io/kfile.c
+	bertos/sec/cipher.c
 	bertos/sec/cipher/blowfish.c
+	bertos/sec/cipher/aes.c
+	bertos/sec/kdf/pbkdf1.c
+	bertos/sec/kdf/pbkdf2.c
+	bertos/sec/hash/sha1.c
+	bertos/sec/hash/md5.c
+	bertos/sec/hash/ripemd.c
+	bertos/sec/mac/hmac.c
+	bertos/sec/mac/omac.c
 "
 
 buildout='/dev/null'
-- 
2.25.1