X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;ds=sidebyside;f=sha1.c;h=2f38e60eaa4b7bb44239c69f2e3d60850524d9bb;hb=53f8a8d7ca5c03120224128e1f8552c99f6af11e;hp=d45f7699760cf52bdb2f0913c71206c6a842817d;hpb=f746b1cd8b111c52014e72d6c86d0d159721b5ce;p=avr-crypto-lib.git

diff --git a/sha1.c b/sha1.c
index d45f769..2f38e60 100644
--- a/sha1.c
+++ b/sha1.c
@@ -1,9 +1,26 @@
+/* sha1.c */
+/*
+    This file is part of the AVR-Crypto-Lib.
+    Copyright (C) 2008  Daniel Otte (daniel.otte@rub.de)
+
+    This program 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 3 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, see <http://www.gnu.org/licenses/>.
+*/
 /**
  * \file	sha1.c
  * \author	Daniel Otte
- * \date	08.10.2006
- * \par License:
- * GPLv3
+ * \date	2006-10-08
+ * \license GPLv3 or later
  * \brief SHA-1 implementation.
  * 
  */
@@ -71,7 +88,7 @@ uint32_t parity(uint32_t x, uint32_t y, uint32_t z){
 
 typedef uint32_t (*pf_t)(uint32_t x, uint32_t y, uint32_t z);
 
-void sha1_nextBlock (sha1_ctx_t *state, void* block){
+void sha1_nextBlock (sha1_ctx_t *state, const void* block){
 	uint32_t a[5];
 	uint32_t w[16];
 	uint32_t temp;
@@ -147,19 +164,19 @@ void sha1_nextBlock (sha1_ctx_t *state, void* block){
 
 /********************************************************************************************************/
 
-void sha1_lastBlock(sha1_ctx_t *state, void* block, uint16_t length){
+void sha1_lastBlock(sha1_ctx_t *state, const void* block, uint16_t length){
 	uint8_t lb[SHA1_BLOCK_BITS/8]; /* local block */
 	state->length += length;
 	memcpy (&(lb[0]), block, length/8);
 	
 	/* set the final one bit */
-	if (length & 0x3){ /* if we have single bits at the end */
+	if (length & 0x7){ /* if we have single bits at the end */
 		lb[length/8] = ((uint8_t*)(block))[length/8];
 	} else {
 		lb[length/8] = 0;
 	}
 	lb[length/8] |= 0x80>>(length & 0x3);
-	length =(length >> 3) + 1; /* from now on length contains the number of BYTES in lb*/
+	length =(length >> 7) + 1; /* from now on length contains the number of BYTES in lb*/
 	/* pad with zeros */
 	if (length>64-8){ /* not enouth space for 64bit length value */
 		memset((void*)(&(lb[length])), 0, 64-length);
@@ -202,14 +219,14 @@ void sha1_ctx2hash (sha1_hash_t *dest, sha1_ctx_t *state){
  * 
  * 
  */
-void sha1 (sha1_hash_t *dest, void* msg, uint32_t length){
+void sha1 (sha1_hash_t *dest, const void* msg, uint32_t length){
 	sha1_ctx_t s;
 	DEBUG_S("\r\nBLA BLUB");
 	sha1_init(&s);
 	while(length & (~0x0001ff)){ /* length>=512 */
 		DEBUG_S("\r\none block");
 		sha1_nextBlock(&s, msg);
-		msg += SHA1_BLOCK_BITS/8; /* increment pointer to next block */
+		msg = (uint8_t*)msg + SHA1_BLOCK_BITS/8; /* increment pointer to next block */
 		length -= SHA1_BLOCK_BITS;
 	}
 	sha1_lastBlock(&s, msg, length);