From 8a5d3ca959df17661e75c69871aadac3dab07953 Mon Sep 17 00:00:00 2001 From: Simon Wilkinson Date: Tue, 14 Sep 2010 10:24:43 -0700 Subject: [PATCH] Rename current to SHA1current Some kernels define 'current' as a #define. This causes chaos when we try to build sha.c. So, rename current as 'SHA1current', and avoid the insanity. --- lib/hcrypto/sha.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/hcrypto/sha.c b/lib/hcrypto/sha.c index 39c53b0a5..9c8b39e24 100644 --- a/lib/hcrypto/sha.c +++ b/lib/hcrypto/sha.c @@ -240,13 +240,13 @@ SHA1_Update (struct sha *m, const void *v, size_t len) if(offset == 64){ #if !defined(WORDS_BIGENDIAN) || defined(_CRAY) int i; - uint32_t current[16]; + uint32_t SHA1current[16]; struct x32 *us = (struct x32*)m->save; for(i = 0; i < 8; i++){ - current[2*i+0] = swap_uint32_t(us[i].a); - current[2*i+1] = swap_uint32_t(us[i].b); + SHA1current[2*i+0] = swap_uint32_t(us[i].a); + SHA1current[2*i+1] = swap_uint32_t(us[i].b); } - calc(m, current); + calc(m, SHA1current); #else calc(m, (uint32_t*)m->save); #endif