oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Rename current to SHA1current

Browse Source 
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.
This commit is contained in:
Simon Wilkinson
2010-09-14 10:24:43 -07:00
committed by Love Hornquist Astrand
parent 64a2e57029
commit 8a5d3ca959
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/hcrypto/sha.c
View File

@@ -240,13 +240,13 @@ SHA1_Update (struct sha *m, const void *v, size_t len)
if(offset == 64){ if(offset == 64){
#if !defined(WORDS_BIGENDIAN) || defined(_CRAY) #if !defined(WORDS_BIGENDIAN) || defined(_CRAY)
int i; int i;
uint32_t current[16]; uint32_t SHA1current[16];
struct x32 *us = (struct x32*)m->save; struct x32 *us = (struct x32*)m->save;
for(i = 0; i < 8; i++){ for(i = 0; i < 8; i++){
current[2*i+0] = swap_uint32_t(us[i].a); SHA1current[2*i+0] = swap_uint32_t(us[i].a);
current[2*i+1] = swap_uint32_t(us[i].b); SHA1current[2*i+1] = swap_uint32_t(us[i].b);
} }
calc(m, current); calc(m, SHA1current);
#else #else
calc(m, (uint32_t*)m->save); calc(m, (uint32_t*)m->save);
#endif #endif