diff options
author | Matt Johnston <matt@ucc.asn.au> | 2007-02-03 08:20:30 +0000 |
---|---|---|
committer | Matt Johnston <matt@ucc.asn.au> | 2007-02-03 08:20:30 +0000 |
commit | c5fd7dd5548f28e32d846e39d17e5c4de4e769af (patch) | |
tree | 81b522e272facfb27ff614936b4988bf6569ef2d /libtomcrypt/src/hashes/sha1.c | |
parent | 5092e30605dfc5c45990d91cf606990e5c768255 (diff) | |
parent | 4a5208512ba02f735acbf7e948ed02353583581e (diff) |
merge of '1250b8af44b62d8f4fe0f8d9fc7e7a1cc34e7e1c'
and '7f8670ac3bb975f40967f3979d09d2199b7e90c8'
--HG--
extra : convert_revision : 6b61c50f4cf888bea302ac8fcf5dbb573b443251
Diffstat (limited to 'libtomcrypt/src/hashes/sha1.c')
-rw-r--r-- | libtomcrypt/src/hashes/sha1.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libtomcrypt/src/hashes/sha1.c b/libtomcrypt/src/hashes/sha1.c index a75d04d..8cc6855 100644 --- a/libtomcrypt/src/hashes/sha1.c +++ b/libtomcrypt/src/hashes/sha1.c @@ -6,7 +6,7 @@ * The library is free for all purposes without any express * guarantee it works. * - * Tom St Denis, tomstdenis@gmail.com, http://libtomcrypt.org + * Tom St Denis, tomstdenis@gmail.com, http://libtomcrypt.com */ #include "tomcrypt.h" @@ -32,7 +32,8 @@ const struct ltc_hash_descriptor sha1_desc = &sha1_init, &sha1_process, &sha1_done, - &sha1_test + &sha1_test, + NULL }; #define F0(x,y,z) (z ^ (x & (y ^ z))) @@ -270,7 +271,7 @@ int sha1_test(void) sha1_init(&md); sha1_process(&md, (unsigned char*)tests[i].msg, (unsigned long)strlen(tests[i].msg)); sha1_done(&md, tmp); - if (memcmp(tmp, tests[i].hash, 20) != 0) { + if (XMEMCMP(tmp, tests[i].hash, 20) != 0) { return CRYPT_FAIL_TESTVECTOR; } } @@ -283,5 +284,5 @@ int sha1_test(void) /* $Source: /cvs/libtom/libtomcrypt/src/hashes/sha1.c,v $ */ -/* $Revision: 1.5 $ */ -/* $Date: 2005/05/23 02:42:07 $ */ +/* $Revision: 1.8 $ */ +/* $Date: 2006/11/01 09:28:17 $ */ |