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/helper/hash_memory_multi.c | |
| parent | 5092e30605dfc5c45990d91cf606990e5c768255 (diff) | |
| parent | 4a5208512ba02f735acbf7e948ed02353583581e (diff) | |
merge of '1250b8af44b62d8f4fe0f8d9fc7e7a1cc34e7e1c'
and '7f8670ac3bb975f40967f3979d09d2199b7e90c8'
--HG--
extra : convert_revision : 6b61c50f4cf888bea302ac8fcf5dbb573b443251
Diffstat (limited to 'libtomcrypt/src/hashes/helper/hash_memory_multi.c')
| -rw-r--r-- | libtomcrypt/src/hashes/helper/hash_memory_multi.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libtomcrypt/src/hashes/helper/hash_memory_multi.c b/libtomcrypt/src/hashes/helper/hash_memory_multi.c index 8fcb8e9..91f2d0c 100644 --- a/libtomcrypt/src/hashes/helper/hash_memory_multi.c +++ b/libtomcrypt/src/hashes/helper/hash_memory_multi.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" #include <stdarg.h> @@ -43,6 +43,7 @@ int hash_memory_multi(int hash, unsigned char *out, unsigned long *outlen, } if (*outlen < hash_descriptor[hash].hashsize) { + *outlen = hash_descriptor[hash].hashsize; return CRYPT_BUFFER_OVERFLOW; } @@ -82,5 +83,5 @@ LBL_ERR: } /* $Source: /cvs/libtom/libtomcrypt/src/hashes/helper/hash_memory_multi.c,v $ */ -/* $Revision: 1.3 $ */ -/* $Date: 2005/05/05 14:35:58 $ */ +/* $Revision: 1.5 $ */ +/* $Date: 2006/06/16 21:53:41 $ */ |