forgotten files

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

diff --git a/sha1.c b/sha1.c
index 1dd6acf80b344dc90a7e204533c71f8001e010be..97cde32814fbfd5264167e35060915e6ed9df641 100644 (file)
--- a/sha1.c
+++ b/sha1.c
@@ -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;
@@ -110,7 +110,7 @@ void sha1_nextBlock (sha1_ctx_t *state, void* block){
                DEBUG_B(dbgi);
                DEBUG_C(':');
                #ifdef DEBUG
-                       uart_hexdump(&(w[dbgi]) ,4);
+                       cli_hexdump(&(w[dbgi]) ,4);
                #endif
        }
        
@@ -124,12 +124,12 @@ void sha1_nextBlock (sha1_ctx_t *state, void* block){
                s = t & MASK;
                if(t>=16){
                        #ifdef DEBUG
-                        DEBUG_S("\r\n ws = "); uart_hexdump(&ws, 4);
+                        DEBUG_S("\r\n ws = "); cli_hexdump(&ws, 4);
                        #endif
                        w[s] = rotl32( w[(s+13)&MASK] ^ w[(s+8)&MASK] ^ 
                                 w[(s+ 2)&MASK] ^ w[s] ,1);                     
                        #ifdef DEBUG
-                        DEBUG_S(" --> ws = "); uart_hexdump(&(w[s]), 4);
+                        DEBUG_S(" --> ws = "); cli_hexdump(&(w[s]), 4);
                        #endif
                }
                
@@ -143,15 +143,15 @@ void sha1_nextBlock (sha1_ctx_t *state, void* block){
                DEBUG_S("\r\nt = "); DEBUG_B(t);
                DEBUG_S("; a[]: ");
                #ifdef DEBUG
-                uart_hexdump(a, 5*4);
+                cli_hexdump(a, 5*4);
                #endif
                DEBUG_S("; k = ");
                #ifdef DEBUG
-                uart_hexdump(&(k[t/20]), 4);
+                cli_hexdump(&(k[t/20]), 4);
                #endif
                DEBUG_S("; f(b,c,d) = ");
                #ifdef DEBUG
-                uart_hexdump(&dtemp, 4);
+                cli_hexdump(&dtemp, 4);
                #endif
        }
        
@@ -164,7 +164,7 @@ 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);
@@ -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);