X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=sha1.c;h=1dd6acf80b344dc90a7e204533c71f8001e010be;hb=2dc047a070be7f0d64f4d4e7f4296a9650af07dc;hp=89e9f8d5e5138000fcb96e44d0aba485a2b4e323;hpb=cb23251fd9f7c2d9e519a84b6975091bceb0fa66;p=avr-crypto-lib.git

diff --git a/sha1.c b/sha1.c
index 89e9f8d..1dd6acf 100644
--- a/sha1.c
+++ b/sha1.c
@@ -1,6 +1,6 @@
 /* sha1.c */
 /*
-    This file is part of the Crypto-avr-lib/microcrypt-lib.
+    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
@@ -19,9 +19,8 @@
 /**
  * \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.
  * 
  */
@@ -171,13 +170,13 @@ void sha1_lastBlock(sha1_ctx_t *state, void* block, uint16_t 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);