diff options
Diffstat (limited to 'contrib/opie/libopie/hash.c')
-rw-r--r-- | contrib/opie/libopie/hash.c | 37 |
1 files changed, 25 insertions, 12 deletions
diff --git a/contrib/opie/libopie/hash.c b/contrib/opie/libopie/hash.c index 4029fa9..4b72d6b 100644 --- a/contrib/opie/libopie/hash.c +++ b/contrib/opie/libopie/hash.c @@ -1,24 +1,24 @@ /* hash.c: The opiehash() library function. -%%% copyright-cmetz -This software is Copyright 1996 by Craig Metz, All Rights Reserved. +%%% copyright-cmetz-96 +This software is Copyright 1996-1997 by Craig Metz, All Rights Reserved. The Inner Net License Version 2 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 + 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. */ #include "opie_cfg.h" -#include "opie.h" - -static struct opiemdx_ctx mdx; -static UINT4 mdx_tmp[4]; #if 0 -static SHA_INFO sha; +#include "sha.h" #endif /* 0 */ +#include "opie.h" VOIDRET opiehash FUNCTION((x, algorithm), VOIDPTR x AND unsigned algorithm) { @@ -27,26 +27,39 @@ VOIDRET opiehash FUNCTION((x, algorithm), VOIDPTR x AND unsigned algorithm) switch(algorithm) { #if 0 case 3: - sha_init(&sha); - sha_update(&sha, (BYTE *)x, 8); - sha_final(&sha); - results[0] = sha.digest[0] ^ sha.digest[2] ^ sha.digest[4]; - results[1] = sha.digest[1] ^ sha.digest[3] ^ sha.digest[5]; + { + SHA_CTX sha; + SHAInit(&sha); + SHAUpdate(&sha, (unsigned char *)x, 8); + SHAFinal(&sha); + results[0] = sha.buffer[0] ^ sha.buffer[2] ^ sha.buffer[4]; + results[1] = sha.buffer[1] ^ sha.buffer[3]; + }; break; #endif /* 0 */ case 4: + { + struct opiemdx_ctx mdx; + UINT4 mdx_tmp[4]; + opiemd4init(&mdx); opiemd4update(&mdx, (unsigned char *)x, 8); opiemd4final((unsigned char *)mdx_tmp, &mdx); results[0] = mdx_tmp[0] ^ mdx_tmp[2]; results[1] = mdx_tmp[1] ^ mdx_tmp[3]; + }; break; case 5: + { + struct opiemdx_ctx mdx; + UINT4 mdx_tmp[4]; + opiemd5init(&mdx); opiemd5update(&mdx, (unsigned char *)x, 8); opiemd5final((unsigned char *)mdx_tmp, &mdx); results[0] = mdx_tmp[0] ^ mdx_tmp[2]; results[1] = mdx_tmp[1] ^ mdx_tmp[3]; + }; break; } } |