/* 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);
/* 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];