comparison libtomcrypt/src/hashes/helper/hash_memory_multi.c @ 415:8b9aba1d5fa4 channel-fix

merge of '73fe066c5d9e2395354ba74756124d45c978a04d' and 'f5014cc84558f1e8eba42dbecf9f72f94bfe6134'
author Matt Johnston <matt@ucc.asn.au>
date Tue, 06 Feb 2007 16:00:18 +0000
parents 0cbe8f6dbf9e
children f849a5ca2efc
comparison
equal deleted inserted replaced
414:c53a26c430e5 415:8b9aba1d5fa4
4 * algorithms in a highly modular and flexible manner. 4 * algorithms in a highly modular and flexible manner.
5 * 5 *
6 * The library is free for all purposes without any express 6 * The library is free for all purposes without any express
7 * guarantee it works. 7 * guarantee it works.
8 * 8 *
9 * Tom St Denis, [email protected], http://libtomcrypt.org 9 * Tom St Denis, [email protected], http://libtomcrypt.com
10 */ 10 */
11 #include "tomcrypt.h" 11 #include "tomcrypt.h"
12 #include <stdarg.h> 12 #include <stdarg.h>
13 /** 13 /**
14 @file hash_memory_multi.c 14 @file hash_memory_multi.c
41 if ((err = hash_is_valid(hash)) != CRYPT_OK) { 41 if ((err = hash_is_valid(hash)) != CRYPT_OK) {
42 return err; 42 return err;
43 } 43 }
44 44
45 if (*outlen < hash_descriptor[hash].hashsize) { 45 if (*outlen < hash_descriptor[hash].hashsize) {
46 *outlen = hash_descriptor[hash].hashsize;
46 return CRYPT_BUFFER_OVERFLOW; 47 return CRYPT_BUFFER_OVERFLOW;
47 } 48 }
48 49
49 md = XMALLOC(sizeof(hash_state)); 50 md = XMALLOC(sizeof(hash_state));
50 if (md == NULL) { 51 if (md == NULL) {
80 va_end(args); 81 va_end(args);
81 return err; 82 return err;
82 } 83 }
83 84
84 /* $Source: /cvs/libtom/libtomcrypt/src/hashes/helper/hash_memory_multi.c,v $ */ 85 /* $Source: /cvs/libtom/libtomcrypt/src/hashes/helper/hash_memory_multi.c,v $ */
85 /* $Revision: 1.3 $ */ 86 /* $Revision: 1.5 $ */
86 /* $Date: 2005/05/05 14:35:58 $ */ 87 /* $Date: 2006/06/16 21:53:41 $ */