Update to libtomcrypt 1.18.1, merged with Dropbear changes

1 files changed, 34 insertions, 33 deletions

diff --git a/libtomcrypt/src/mac/hmac/hmac_file.c b/libtomcrypt/src/mac/hmac/hmac_file.c
index d9841bd..c106941 100644
--- a/libtomcrypt/src/mac/hmac/hmac_file.c
+++ b/libtomcrypt/src/mac/hmac/hmac_file.c
@@ -5,30 +5,28 @@
  *
  * The library is free for all purposes without any express
  * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
  */
 #include "tomcrypt.h"
 
 /**
   @file hmac_file.c
-  LTC_HMAC support, process a file, Tom St Denis/Dobes Vandermeer
+  HMAC support, process a file, Tom St Denis/Dobes Vandermeer
 */
 
 #ifdef LTC_HMAC
 
 /**
-  LTC_HMAC a file
+  HMAC a file
   @param hash     The index of the hash you wish to use
-  @param fname    The name of the file you wish to LTC_HMAC
+  @param fname    The name of the file you wish to HMAC
   @param key      The secret key
   @param keylen   The length of the secret key
-  @param out      [out] The LTC_HMAC authentication tag
+  @param out      [out] The HMAC authentication tag
   @param outlen   [in/out]  The max size and resulting size of the authentication tag
   @return CRYPT_OK if successful, CRYPT_NOP if file support has been disabled
 */
-int hmac_file(int hash, const char *fname, 
-              const unsigned char *key, unsigned long keylen, 
+int hmac_file(int hash, const char *fname,
+              const unsigned char *key, unsigned long keylen,
                     unsigned char *out, unsigned long *outlen)
 {
 #ifdef LTC_NO_FILE
@@ -37,7 +35,7 @@ int hmac_file(int hash, const char *fname,
 #else
    hmac_state hmac;
    FILE *in;
-   unsigned char buf[512];
+   unsigned char *buf;
    size_t x;
    int err;
 
@@ -45,50 +43,53 @@ int hmac_file(int hash, const char *fname,
    LTC_ARGCHK(key    != NULL);
    LTC_ARGCHK(out    != NULL);
    LTC_ARGCHK(outlen != NULL);
-   
-   if((err = hash_is_valid(hash)) != CRYPT_OK) {
-       return err;
+
+   if ((buf = XMALLOC(LTC_FILE_READ_BUFSIZE)) == NULL) {
+      return CRYPT_MEM;
+   }
+
+   if ((err = hash_is_valid(hash)) != CRYPT_OK) {
+      goto LBL_ERR;
    }
 
    if ((err = hmac_init(&hmac, hash, key, keylen)) != CRYPT_OK) {
-       return err;
+      goto LBL_ERR;
    }
 
    in = fopen(fname, "rb");
    if (in == NULL) {
-      return CRYPT_FILE_NOTFOUND;
+      err = CRYPT_FILE_NOTFOUND;
+      goto LBL_ERR;
    }
 
-   /* process the file contents */
    do {
-      x = fread(buf, 1, sizeof(buf), in);
+      x = fread(buf, 1, LTC_FILE_READ_BUFSIZE, in);
       if ((err = hmac_process(&hmac, buf, (unsigned long)x)) != CRYPT_OK) {
-         /* we don't trap this error since we're already returning an error! */
-         fclose(in);
-         return err;
+         fclose(in); /* we don't trap this error since we're already returning an error! */
+         goto LBL_CLEANBUF;
       }
-   } while (x == sizeof(buf));
+   } while (x == LTC_FILE_READ_BUFSIZE);
 
    if (fclose(in) != 0) {
-      return CRYPT_ERROR;
+      err = CRYPT_ERROR;
+      goto LBL_CLEANBUF;
    }
 
-   /* get final hmac */
-   if ((err = hmac_done(&hmac, out, outlen)) != CRYPT_OK) {
-      return err;
-   }
+   err = hmac_done(&hmac, out, outlen);
 
+LBL_CLEANBUF:
+   zeromem(buf, LTC_FILE_READ_BUFSIZE);
+LBL_ERR:
 #ifdef LTC_CLEAN_STACK
-   /* clear memory */
-   zeromem(buf, sizeof(buf));
-#endif   
-   return CRYPT_OK;
+   zeromem(&hmac, sizeof(hmac_state));
+#endif
+   XFREE(buf);
+   return err;
 #endif
 }
 
 #endif
 
-
-/* $Source$ */
-/* $Revision$ */
-/* $Date$ */
+/* ref:         $Format:%D$ */
+/* git commit:  $Format:%H$ */
+/* commit time: $Format:%ai$ */