Update to libtomcrypt 1.18.1, merged with Dropbear changes

1 files changed, 8 insertions, 10 deletions

diff --git a/libtomcrypt/src/mac/f9/f9_memory_multi.c b/libtomcrypt/src/mac/f9/f9_memory_multi.c
index 7a13ff9..2c1d31a 100644
--- a/libtomcrypt/src/mac/f9/f9_memory_multi.c
+++ b/libtomcrypt/src/mac/f9/f9_memory_multi.c
@@ -5,13 +5,11 @@
  *
  * 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"
 #include <stdarg.h>
 
-/** 
+/**
   @file f9_memory_multi.c
   f9 support, process multiple blocks of memory, Tom St Denis
 */
@@ -19,7 +17,7 @@
 #ifdef LTC_F9_MODE
 
 /**
-   f9 multiple blocks of memory 
+   f9 multiple blocks of memory
    @param cipher    The index of the desired cipher
    @param key       The secret key
    @param keylen    The length of the secret key (octets)
@@ -30,7 +28,7 @@
    @param ...       tuples of (data,len) pairs to f9, terminated with a (NULL,x) (x=don't care)
    @return CRYPT_OK if successful
 */
-int f9_memory_multi(int cipher, 
+int f9_memory_multi(int cipher,
                 const unsigned char *key, unsigned long keylen,
                       unsigned char *out, unsigned long *outlen,
                 const unsigned char *in,  unsigned long inlen, ...)
@@ -57,7 +55,7 @@ int f9_memory_multi(int cipher,
       goto LBL_ERR;
    }
    va_start(args, inlen);
-   curptr = in; 
+   curptr = in;
    curlen = inlen;
    for (;;) {
       /* process buf */
@@ -80,11 +78,11 @@ LBL_ERR:
 #endif
    XFREE(f9);
    va_end(args);
-   return err;   
+   return err;
 }
 
 #endif
 
-/* $Source$ */
-/* $Revision$ */
-/* $Date$ */
+/* ref:         $Format:%D$ */
+/* git commit:  $Format:%H$ */
+/* commit time: $Format:%ai$ */