X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=algos%2Fmd2.c;h=53b44865776caf105d0a0d27d821c8b083103d5e;hb=9ba9dcf2a59a952609e19154e11de3e2478cbf42;hp=208fd08ea53a88b7076215a590c03403ae73eb7e;hpb=5a4372fdfbeda7900502dd47d0a262080d86bd35;p=bertos.git

diff --git a/algos/md2.c b/algos/md2.c
old mode 100755
new mode 100644
index 208fd08e..53b44865
--- a/algos/md2.c
+++ b/algos/md2.c
@@ -1,20 +1,61 @@
 /**
  * \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 2007 Develer S.r.l. (http://www.develer.com/)
- * This file is part of DevLib - See README.devlib for information.
+ *
  * -->
  *
  * \brief MD2 Message-Digest algorithm.
  *
+ * The MD2 algorithm work with a constant array of 256 permutationt
+ * defined in RFC1319. If you don't want to use a standard array of
+ * permutatione you can use a md2_perm() function that generate an
+ * array of 256 "casual" permutation. To swich from a standard array
+ * 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).
+ *
+ *
  * \version $Id$
  * \author Daniele Basile <asterix@develer.com>
  */
 
 /*#*
  *#* $Log$
- *#* Revision 1.14  2007/02/06 09:47:53  asterix
- *#* Typo.
+ *#* 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.
@@ -50,16 +91,16 @@
 #include <string.h>           //memset(), memcpy();
 #include <cfg/compiler.h>
 #include <cfg/debug.h>        //ASSERT()
-#include <cfg/macros.h>       //MIN(), countof();
-#include <mware/pgm.h>   
+#include <cfg/macros.h>       //MIN(), countof(), ROTR();
+#include <mware/pgm.h>
 
 
-#ifdef STD_PERMUTATION
+#if CONFIG_MD2_STD_PERM
 	/*
 	* Official array of 256 byte pemutation contructed from digits of pi, defined
 	* in the RFC 1319.
 	*/
-	static const uint8_t PROGMEM md2_perm[256] = 
+	static const uint8_t PGM_ATTR md2_perm[256] =
 	{
 	41, 46, 67, 201, 162, 216, 124, 1, 61, 54, 84, 161, 236, 240, 6,
 	19, 98, 167, 5, 243, 192, 199, 115, 140, 152, 147, 43, 217, 188,
@@ -80,11 +121,13 @@
 	166, 119, 114, 248, 235, 117, 75, 10, 49, 68, 80, 180, 143, 237,
 	31, 26, 219, 153, 141, 51, 159, 17, 131, 20
 	};
+
+	#define MD2_PERM(x) PGM_READ_CHAR(&md2_perm[x])
 #else
 	/**
 	 * Md2_perm() function generate an array of 256 "casual" permutation.
 	 */
-	
+
 	/**
 	 * Costant define for computing an array of 256 "casual" permutation.
 	 * \{
@@ -95,34 +138,22 @@
 	#define X  172
 	/*\}*/
 
-uint8_t md2_perm(uint8_t i)
-{
+	static uint8_t md2_perm(uint8_t i)
+	{
 
-	i = i * K1;
-	i = (i >> R) ^ (i << R); //Rotate i for R times.
-	i ^=  X;
-	i = i * K2;
+		i = i * K1;
+		i = ROTR(i, R);
+		i ^=  X;
+		i = i * K2;
 
-	return i;
-}
-	
-#endif
+		return i;
+	}
 
+	#define MD2_PERM(x) md2_perm(x)
 
-#if CPU_HARVARD 
-	#ifdef STD_PERMUTATION
-		#define	MD2_PERM(x) pgm_read_char(&md2_permr[x]) //Read from program memory, if CPU is harvard
-	#else
-		#define	MD2_PERM(x) pgm_read_char(&md2_permr(x)) //Read from program memory, if CPU is harvard
-	#endif
-#else
-	#ifdef STD_PERMUTATION
-		#define	MD2_PERM(x) md2_perm[x]                  //
-	#else
-		#define	MD2_PERM(x) md2_perm(x)                  //
-	#endif
 #endif
 
+
 /**
  * Pad function. Put len_pad unsigned char in
  * input block.
@@ -201,7 +232,7 @@ static void md2_compute(void *_state, void *_checksum, void *_block)
 /**
  * Algorithm initialization.
  *
- * \param empty context.
+ * \param context empty context.
  */
 void md2_init(Md2Context *context)
 {
@@ -229,14 +260,14 @@ void md2_update(Md2Context *context, const void *_block_in, size_t block_len)
 		 */
 		cpy_len = MIN(block_len, CONFIG_MD2_BLOCK_LEN - context->counter);
 
-		
+
 		/*
 		 * Copy in the buffer input block.
 		 */
 		memcpy(&context->buffer[context->counter], block_in, cpy_len);
 
 		/*
-		 * Update a context counter, input block length and remaning 
+		 * Update a context counter, input block length and remaning
 		 * context buffer block lenght.
 		 */
 		context->counter += cpy_len;
@@ -322,7 +353,7 @@ bool md2_test(void)
 		md2_init(&context);
 		md2_update(&context, test[i], strlen(test[i]));
 
-		if(memcmp(result[i], md2_end(&context), CONFIG_MD2_BLOCK_LEN))
+		if(memcmp(result[i], md2_end(&context), MD2_DIGEST_LEN))
 			return false;
 	}