X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Falgo%2Fmd2.c;h=a36cc76361618ac8c0b33d55c65a9fa0d1c2221e;hb=cab3f45017be1c781cfe11377ae0ecb0c00f2e59;hp=53b44865776caf105d0a0d27d821c8b083103d5e;hpb=791e167e053bdd9250d34a9a5ccae6ccde4d6679;p=bertos.git

diff --git a/bertos/algo/md2.c b/bertos/algo/md2.c
index 53b44865..a36cc763 100644
--- a/bertos/algo/md2.c
+++ b/bertos/algo/md2.c
@@ -39,60 +39,20 @@
  * to md2_perm function you must chanche CONFIG_MD2_STD_PERM defined in
  * appconfig.h.
  * If you need to store array in program memory you must define
- * a macro _PROGMEM (for more info see mware/pgm.h).
+ * a macro _PROGMEM (for more info see cpu/pgm.h).
  *
  *
  * \version $Id$
  * \author Daniele Basile <asterix@develer.com>
  */
 
-/*#*
- *#* $Log$
- *#* Revision 1.17  2007/06/07 16:06:39  batt
- *#* Fix some doxygen errors.
- *#*
- *#* Revision 1.16  2007/02/15 13:29:49  asterix
- *#* Add MD2_DIGEST_LEN macro.
- *#*
- *#* Revision 1.15  2007/02/06 15:53:34  asterix
- *#* Add ROTR macro in m2d_perm, add comments, typos.
- *#*
- *#* Revision 1.13  2007/02/05 18:44:42  asterix
- *#* Add md2_perm function.
- *#*
- *#* Revision 1.12  2007/02/05 16:52:44  asterix
- *#* Add define for harvard architecture.
- *#*
- *#* Revision 1.11  2007/02/02 18:15:31  asterix
- *#* Add function MD2_test. Fix bug in md2_update function.
- *#*
- *#* Revision 1.9  2007/02/02 13:10:01  asterix
- *#* Fix some bugs in md2_pad and md2_update fuction.
- *#*
- *#* Revision 1.8  2007/02/01 14:45:56  asterix
- *#* Rewrite md2_update function and fix some bug.
- *#*
- *#* Revision 1.7  2007/01/31 18:04:15  asterix
- *#* Write md2_end function
- *#*
- *#* Revision 1.4  2007/01/31 13:51:57  asterix
- *#* Write md2_compute function.
- *#*
- *#* Revision 1.2  2007/01/30 17:31:44  asterix
- *#* Add function prototypes.
- *#*
- *#* Revision 1.1  2007/01/30 15:53:26  batt
- *#* Add first md2 skel.
- *#*
- *#*/
-
 #include "md2.h"
 
 #include <string.h>           //memset(), memcpy();
 #include <cfg/compiler.h>
 #include <cfg/debug.h>        //ASSERT()
 #include <cfg/macros.h>       //MIN(), countof(), ROTR();
-#include <mware/pgm.h>
+#include <cpu/pgm.h>
 
 
 #if CONFIG_MD2_STD_PERM
@@ -340,7 +300,7 @@ bool md2_test(void)
 	};
 
 
-	const uint8_t *result[] = {
+	const char *result[] = {
 		"\x83\x50\xe5\xa3\xe2\x4c\x15\x3d\xf2\x27\x5c\x9f\x80\x69\x27\x73",
 		"\xab\x4f\x49\x6b\xfb\x2a\x53\x0b\x21\x9f\xf3\x30\x31\xfe\x06\xb0",
 		"\x4e\x8d\xdf\xf3\x65\x02\x92\xab\x5a\x41\x08\xc3\xaa\x47\x94\x0b",
@@ -348,7 +308,7 @@ bool md2_test(void)
 	};
 
 
-	for (int i = 0; i < countof(test); i++)
+	for (size_t i = 0; i < countof(test); i++)
 	{
 		md2_init(&context);
 		md2_update(&context, test[i], strlen(test[i]));