From cbdcd1b3a571389f3c24295d2eb0a53bef08e7fa Mon Sep 17 00:00:00 2001 From: rasky Date: Fri, 24 Sep 2010 12:25:54 +0000 Subject: [PATCH] SEC: use proper stack variables instead of a global state. git-svn-id: https://src.develer.com/svnoss/bertos/trunk@4290 38d2e660-2303-0410-9eaa-f027e97ec537 --- bertos/sec/hash/sha1.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/bertos/sec/hash/sha1.c b/bertos/sec/hash/sha1.c index 4333689e..d9dc5c86 100644 --- a/bertos/sec/hash/sha1.c +++ b/bertos/sec/hash/sha1.c @@ -63,9 +63,9 @@ static void SHA1Transform(uint32_t state[5], const uint8_t buffer[64]); /* blk0() and blk() perform the initial expand. */ /* I got the idea of expanding during the round function from SSLeay */ -#define blk0(i) (block->l[i] = be32_to_cpu(block->l[i])) -#define blk(i) (block->l[i&15] = rol(block->l[(i+13)&15]^block->l[(i+8)&15] \ - ^block->l[(i+2)&15]^block->l[i&15],1)) +#define blk0(i) (block[i] = be32_to_cpu(block[i])) +#define blk(i) (block[i&15] = rol(block[(i+13)&15]^block[(i+8)&15] \ + ^block[(i+2)&15]^block[i&15],1)) /* (R0+R1), R2, R3, R4 are the different operations used in SHA1 */ #define R0(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk0(i)+0x5A827999+rol(v,5);w=rol(w,30); @@ -76,18 +76,12 @@ static void SHA1Transform(uint32_t state[5], const uint8_t buffer[64]); /* Hash a single 512-bit block. This is the core of the algorithm. */ -typedef union { - uint8_t c[64]; - uint32_t l[16]; -} CHAR64LONG16; -static CHAR64LONG16 workspace; - static void SHA1Transform(uint32_t state[5], const uint8_t buffer[64]) { uint32_t a, b, c, d, e; + uint32_t block[16]; - CHAR64LONG16* block = &workspace; - memcpy(block, buffer, 64); + memcpy(&block, buffer, 64); /* Copy context->state[] to working vars */ a = state[0]; -- 2.25.1