master
Stefan Krulj 14 years ago
parent 36e0d976b6
commit 26437de3e3
  1. 12
      sha1.c

@ -27,8 +27,7 @@ void sha1_addbyte(uint8_t c){
if(chunk_cnt==64){ if(chunk_cnt==64){
/*chunk extension*/ /*chunk extension*/
uint32_t a,b,c,d,e,chunk_e[64]; uint32_t a,b,c,d,e,chunk_e[64];
for(i=0; i<64; i++){ for(i=0; i<64; ++i){
//chunk_e[i]= _LROT32( _W(i+16-3) ^ _W(i+16-8) ^ _W(i+16-14) ^ _W(i+16-16), 1 );
chunk_e[i]= _LROT32( _W(i+16-3) ^ _W(i+16-8) ^ _W(i+16-14) ^ _W(i+16-16), 1 ); chunk_e[i]= _LROT32( _W(i+16-3) ^ _W(i+16-8) ^ _W(i+16-14) ^ _W(i+16-16), 1 );
} }
a=sha1_digest[4]; a=sha1_digest[4];
@ -54,7 +53,7 @@ void sha1_addbyte(uint8_t c){
k=K4; k=K4;
f=b ^ c ^ d; f=b ^ c ^ d;
} }
temp = e + k + f + _LROT32(a,5) + _W(i); temp = e + k + f+_LROT32(a,5)+_W(i);
e = d; e = d;
d = c; d = c;
c = _LROT32(b,30); c = _LROT32(b,30);
@ -77,13 +76,10 @@ void sha1_fill(int32_t len){
/*"append 0-bits to the message to obtain a length of len%512=448"*/ /*"append 0-bits to the message to obtain a length of len%512=448"*/
/*"append length of message in bits as 64-bit integer"*/ /*"append length of message in bits as 64-bit integer"*/
uint8_t j; uint8_t j;
for(j=0;j<(120-(len-(len/64)*64+1))%64+1;j++){ uint8_t end=(uint8_t)((120-(len-(len/64)*64+1))%64+1);
if(j==0){
sha1_addbyte(0x80); sha1_addbyte(0x80);
}else{ for(j=1;j<end;j++){
sha1_addbyte(0x00); sha1_addbyte(0x00);
}
} }
{ {
uint64_t l=len*8; uint64_t l=len*8;

Loading…
Cancel
Save