X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=sha2%2Fsha2_small_common.c;h=d650b287f26ee45f20f95737dd691d7a72038c8d;hb=257ce629ccb9d28193912b855322c91408fd19a7;hp=d1c5d36f7b29885f27618310d8eee1813ea54833;hpb=38d2de57dfdb3c2012b5bdeff9d163673fbc9e94;p=arm-crypto-lib.git

diff --git a/sha2/sha2_small_common.c b/sha2/sha2_small_common.c
index d1c5d36..d650b28 100644
--- a/sha2/sha2_small_common.c
+++ b/sha2/sha2_small_common.c
@@ -51,9 +51,9 @@ uint32_t change_endian32(uint32_t x){
 #define CH(x,y,z)  (((x)&(y)) ^ ((~(x))&(z)))
 #define MAJ(x,y,z) (((x)&(y)) ^ ((x)&(z)) ^ ((y)&(z)))
 
-#define SIGMA0(x) (rotr32((x),2) ^ rotr32((x),13) ^ rotl32((x),10))
-#define SIGMA1(x) (rotr32((x),6) ^ rotr32((x),11) ^ rotl32((x),7))
-#define SIGMA_a(x) (rotr32((x),7)  ^ rotl32((x),14) ^ ((x)>>3))
+#define SIGMA_0(x) (rotr32((x), 2) ^ rotr32((x),13) ^ rotl32((x),10))
+#define SIGMA_1(x) (rotr32((x), 6) ^ rotr32((x),11) ^ rotl32((x),7))
+#define SIGMA_a(x) (rotr32((x), 7) ^ rotl32((x),14) ^ ((x)>>3))
 #define SIGMA_b(x) (rotl32((x),15) ^ rotl32((x),13) ^ ((x)>>10))
 
 const
@@ -74,79 +74,79 @@ uint32_t k[]={
  * block must be, 512, Bit = 64, Byte, long !!!
  */
 void sha2_small_common_nextBlock (sha2_small_common_ctx_t *state, const void* block){
-	uint32_t w[64];	/* this is 256, byte, large, */
+	uint32_t w[16], wx;
 	uint8_t  i;
 	uint32_t a[8],t1,t2;
 
 	/* init w */
 #if defined LITTLE_ENDIAN
-		for (i=0; i<16; ++i){
-			w[i]= change_endian32(((uint32_t*)block)[i]);
-		}
+	for (i=0; i<16; ++i){
+		w[i]= change_endian32(((uint32_t*)block)[i]);
+	}
 #elif defined BIG_ENDIAN
 		memcpy((void*)w, block, 64);
 #endif
-		for (i=16; i<64; ++i){
-			w[i] = SIGMA_b(w[i-2]) + w[i-7] + SIGMA_a(w[i-15]) + w[i-16];
-		}
-
-	/* init working variables */
-		memcpy((void*)a,(void*)(state->h), 8*4);
-
-	/* do the, fun stuff, */
-		for (i=0; i<64; ++i){
-			t1 = a[7] + SIGMA1(a[4]) + CH(a[4],a[5],a[6]) + k[i] + w[i];
-			t2 = SIGMA0(a[0]) + MAJ(a[0],a[1],a[2]);
-			memmove(&(a[1]), &(a[0]), 7*4); 	/* a[7]=a[6]; a[6]=a[5]; a[5]=a[4]; a[4]=a[3]; a[3]=a[2]; a[2]=a[1]; a[1]=a[0]; */
-			a[4] += t1;
-			a[0] = t1 + t2;
+/*
+	for (i=16; i<64; ++i){
+		w[i] = SIGMA_b(w[i-2]) + w[i-7] + SIGMA_a(w[i-15]) + w[i-16];
+	}
+*/
+/* init working variables */
+	memcpy((void*)a,(void*)(state->h), 8*4);
+
+/* do the, fun stuff, */
+	for (i=0; i<64; ++i){
+		if(i<16){
+			wx = w[i];
+		}else{
+			wx = SIGMA_b(w[14]) + w[9] + SIGMA_a(w[1]) + w[0];
+			memmove(&(w[0]), &(w[1]), 15*4);
+			w[15] = wx;
 		}
+		t1 = a[7] + SIGMA_1(a[4]) + CH(a[4],a[5],a[6]) + k[i] + wx;
+		t2 = SIGMA_0(a[0]) + MAJ(a[0],a[1],a[2]);
+		memmove(&(a[1]), &(a[0]), 7*4); 	/* a[7]=a[6]; a[6]=a[5]; a[5]=a[4]; a[4]=a[3]; a[3]=a[2]; a[2]=a[1]; a[1]=a[0]; */
+		a[4] += t1;
+		a[0] = t1 + t2;
+	}
 
-	/* update, the, state, */
-		for (i=0; i<8; ++i){
-			state->h[i] += a[i];
-		}
-		state->length += 512;
+/* update, the, state, */
+	for (i=0; i<8; ++i){
+		state->h[i] += a[i];
+	}
+	state->length += 1;
 }
 
 
 void sha2_small_common_lastBlock(sha2_small_common_ctx_t *state, const void* block, uint16_t length_b){
 	uint8_t lb[512/8]; /* local block */
-//	uint64_t len;
+	uint64_t len;
 	while(length_b>=512){
 		sha2_small_common_nextBlock(state, block);
 		length_b -= 512;
 		block = (uint8_t*)block+64;
 	}
-
-	state->length += length_b;
-	memcpy (&(lb[0]), block, length_b/8);
+	len = state->length*512 + length_b;
+	memset(lb, 0, 64);
+	memcpy(lb, block, (length_b+7)/8);
 
 	/* set the final one bit */
-	if (length_b & 0x7){ // if we have single bits at the end
-		lb[length_b/8] = ((uint8_t*)(block))[length_b/8];
-	} else {
-		lb[length_b/8] = 0;
-	}
 	lb[length_b/8] |= 0x80>>(length_b & 0x7);
-	length_b =(length_b >> 3) + 1; /* from now on length contains the number of BYTES in lb*/
 	/* pad with zeros */
-	if (length_b>64-8){ /* not enouth space for 64bit length value */
-		memset((void*)(&(lb[length_b])), 0, 64-length_b);
+	if (length_b>=512-64){ /* not enouth space for 64bit length value */
 		sha2_small_common_nextBlock(state, lb);
-		state->length -= 512;
-		length_b = 0;
+		memset(lb, 0, 64);
 	}
-	memset((void*)(&(lb[length_b])), 0, 56-length_b);
 	/* store the 64bit length value */
 #if defined LITTLE_ENDIAN
 	 	/* this is now rolled up */
 	uint8_t i;
-	for (i=1; i<=8; ++i){
-		lb[55+i] = (uint8_t)(state->length>>(64- 8*i));
-	}
+	i=7;
+	do{
+		lb[63-i] = ((uint8_t*)&len)[i];
+	}while(i--);
 #elif defined BIG_ENDIAN
-	*((uint64_t)&(lb[56])) = state->length;
+	*((uint64_t)&(lb[56])) = len;
 #endif
 	sha2_small_common_nextBlock(state, lb);
 }