diff options
Diffstat (limited to 'contrib/opie/libopie/hash.c')
-rw-r--r-- | contrib/opie/libopie/hash.c | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/contrib/opie/libopie/hash.c b/contrib/opie/libopie/hash.c index ef80a79..e89508c 100644 --- a/contrib/opie/libopie/hash.c +++ b/contrib/opie/libopie/hash.c @@ -1,14 +1,15 @@ /* hash.c: The opiehash() library function. %%% copyright-cmetz-96 -This software is Copyright 1996-1998 by Craig Metz, All Rights Reserved. -The Inner Net License Version 2 applies to this software. +This software is Copyright 1996-2001 by Craig Metz, All Rights Reserved. +The Inner Net License Version 3 applies to this software. You should have received a copy of the license with this software. If you didn't get a copy, you may request one from <license@inner.net>. History: - Updated by cmetz for OPIE 2.31. Added SHA support (which may + Modified by cmetz for OPIE 2.4. Use struct opie_otpkey for binary arg. + Modified by cmetz for OPIE 2.31. Added SHA support (which may not be correct). Backed out previous optimizations as they killed thread-safety. Created by cmetz for OPIE 2.3 using the old hash.c as a guide. @@ -20,20 +21,21 @@ you didn't get a copy, you may request one from <license@inner.net>. #endif /* 0 */ #include "opie.h" -VOIDRET opiehash FUNCTION((x, algorithm), VOIDPTR x AND unsigned algorithm) +VOIDRET opiehash FUNCTION((x, algorithm), struct opie_otpkey *results AND +unsigned algorithm) { - UINT4 *results = (UINT4 *)x; - switch(algorithm) { #if 0 case 3: { SHA_CTX sha; + SHAInit(&sha); - SHAUpdate(&sha, (unsigned char *)x, 8); + SHAUpdate(&sha, (unsigned char *)results, 8); SHAFinal(&sha); - results[0] = sha.buffer[0] ^ sha.buffer[2] ^ sha.buffer[4]; - results[1] = sha.buffer[1] ^ sha.buffer[3]; + + results->words[0] = sha.buffer[0] ^ sha.buffer[2] ^ sha.buffer[4]; + results->words[1] = sha.buffer[1] ^ sha.buffer[3]; }; break; #endif /* 0 */ @@ -43,10 +45,11 @@ VOIDRET opiehash FUNCTION((x, algorithm), VOIDPTR x AND unsigned algorithm) UINT4 mdx_tmp[4]; opiemd4init(&mdx); - opiemd4update(&mdx, (unsigned char *)x, 8); + opiemd4update(&mdx, (unsigned char *)results, 8); opiemd4final((unsigned char *)mdx_tmp, &mdx); - results[0] = mdx_tmp[0] ^ mdx_tmp[2]; - results[1] = mdx_tmp[1] ^ mdx_tmp[3]; + + results->words[0] = mdx_tmp[0] ^ mdx_tmp[2]; + results->words[1] = mdx_tmp[1] ^ mdx_tmp[3]; }; break; case 5: @@ -55,10 +58,11 @@ VOIDRET opiehash FUNCTION((x, algorithm), VOIDPTR x AND unsigned algorithm) UINT4 mdx_tmp[4]; opiemd5init(&mdx); - opiemd5update(&mdx, (unsigned char *)x, 8); + opiemd5update(&mdx, (unsigned char *)results, 8); opiemd5final((unsigned char *)mdx_tmp, &mdx); - results[0] = mdx_tmp[0] ^ mdx_tmp[2]; - results[1] = mdx_tmp[1] ^ mdx_tmp[3]; + + results->words[0] = mdx_tmp[0] ^ mdx_tmp[2]; + results->words[1] = mdx_tmp[1] ^ mdx_tmp[3]; }; break; } |