TeaSpeak/tomcrypt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

adjusted file dependant functions

Browse Source 
when LTC_NO_FILE is defined, the functions hash_filehandle()
and hash_file() won't be available at all instead of returning CRYPT_NOP
This commit is contained in:
Steffen Jaeckel 2009-10-01 12:24:45 +02:00
parent 6816ac3f3f
commit 0a432b6b08
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/hashes/helper/hash_file.c
View File

@ -10,6 +10,7 @@
*/ */
#include "tomcrypt.h" #include "tomcrypt.h"
#ifndef LTC_NO_FILE
/** /**
@file hash_file.c @file hash_file.c
Hash a file, Tom St Denis Hash a file, Tom St Denis
@ -24,9 +25,6 @@
*/ */
int hash_file(int hash, const char *fname, unsigned char *out, unsigned long *outlen) int hash_file(int hash, const char *fname, unsigned char *out, unsigned long *outlen)
{ {
#ifdef LTC_NO_FILE
return CRYPT_NOP;
#else
FILE *in; FILE *in;
int err; int err;
LTC_ARGCHK(fname != NULL); LTC_ARGCHK(fname != NULL);
@ -48,8 +46,8 @@ int hash_file(int hash, const char *fname, unsigned char *out, unsigned long *ou
} }
return err; return err;
#endif
} }
#endif /* #ifndef LTC_NO_FILE */
/* $Source$ */ /* $Source$ */

6
src/hashes/helper/hash_filehandle.c
View File

@ -10,6 +10,7 @@
*/ */
#include "tomcrypt.h" #include "tomcrypt.h"
#ifndef LTC_NO_FILE
/** /**
@file hash_filehandle.c @file hash_filehandle.c
Hash open files, Tom St Denis Hash open files, Tom St Denis
@ -25,9 +26,6 @@
*/ */
int hash_filehandle(int hash, FILE *in, unsigned char *out, unsigned long *outlen) int hash_filehandle(int hash, FILE *in, unsigned char *out, unsigned long *outlen)
{ {
#ifdef LTC_NO_FILE
return CRYPT_NOP;
#else
hash_state md; hash_state md;
unsigned char buf[512]; unsigned char buf[512];
size_t x; size_t x;
@ -62,8 +60,8 @@ int hash_filehandle(int hash, FILE *in, unsigned char *out, unsigned long *outle
zeromem(buf, sizeof(buf)); zeromem(buf, sizeof(buf));
#endif #endif
return err; return err;
#endif
} }
#endif /* #ifndef LTC_NO_FILE */
/* $Source$ */ /* $Source$ */

3
src/headers/tomcrypt_hash.h
View File

@ -334,8 +334,11 @@ int hash_memory(int hash,
unsigned char *out, unsigned long *outlen); unsigned char *out, unsigned long *outlen);
int hash_memory_multi(int hash, unsigned char *out, unsigned long *outlen, int hash_memory_multi(int hash, unsigned char *out, unsigned long *outlen,
const unsigned char *in, unsigned long inlen, ...); const unsigned char *in, unsigned long inlen, ...);
#ifndef LTC_NO_FILE
int hash_filehandle(int hash, FILE *in, unsigned char *out, unsigned long *outlen); int hash_filehandle(int hash, FILE *in, unsigned char *out, unsigned long *outlen);
int hash_file(int hash, const char *fname, unsigned char *out, unsigned long *outlen); int hash_file(int hash, const char *fname, unsigned char *out, unsigned long *outlen);
#endif
/* a simple macro for making hash "process" functions */ /* a simple macro for making hash "process" functions */
#define HASH_PROCESS(func_name, compress_name, state_var, block_size) \ #define HASH_PROCESS(func_name, compress_name, state_var, block_size) \