X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=sha1.c;h=1dd6acf80b344dc90a7e204533c71f8001e010be;hb=a0ce7501a539a69774754515268ab02297dabba7;hp=b2fc2837875cd10235149f767ebc2d4327445147;hpb=17332291e15183d71d88ed868275e3cb53917180;p=avr-crypto-lib.git diff --git a/sha1.c b/sha1.c index b2fc283..1dd6acf 100644 --- a/sha1.c +++ b/sha1.c @@ -1,6 +1,6 @@ /* sha1.c */ /* - This file is part of the This file is part of the AVR-Crypto-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 @@ -170,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);