changing hmac API + bug fixes

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

diff --git a/sha1.c b/sha1.c
index f812be97e34b1ce036cbe66c8c4ff79c112f1086..2f38e60eaa4b7bb44239c69f2e3d60850524d9bb 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 AVR-Crypto-Lib.
     Copyright (C) 2008  Daniel Otte (daniel.otte@rub.de)
 
     This program is free software: you can redistribute it and/or modify
@@ -88,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;
@@ -164,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);
@@ -219,7 +219,7 @@ 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);