fixing a bug in sha1-C and sha256-C (only C-Versions are affected) in setting the...

[avr-crypto-lib.git] / sha1.c

diff --git a/sha1.c b/sha1.c
index 7982412b1ca91d05873db0fef9e657574343a12d..045af10a2e3098257c06220e910952dfbc36302d 100644 (file)
--- 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 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);
@@ -227,7 +226,7 @@ void sha1 (sha1_hash_t *dest, void* msg, uint32_t length){
        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);