merge from main

--HG--
branch : fuzz

1 files changed, 9 insertions, 11 deletions

diff --git a/libtomcrypt/src/mac/pmac/pmac_memory_multi.c b/libtomcrypt/src/mac/pmac/pmac_memory_multi.c
index 36783d3..f3de4b5 100644
--- a/libtomcrypt/src/mac/pmac/pmac_memory_multi.c
+++ b/libtomcrypt/src/mac/pmac/pmac_memory_multi.c
@@ -5,15 +5,13 @@
  *
  * 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 pmac_memory_multi.c
-   PMAC implementation, process multiple blocks of memory, by Tom St Denis 
+   PMAC implementation, process multiple blocks of memory, by Tom St Denis
 */
 
 #ifdef LTC_PMAC
@@ -30,7 +28,7 @@
    @param ...      tuples of (data,len) pairs to PMAC, terminated with a (NULL,x) (x=don't care)
    @return CRYPT_OK if successful
 */
-int pmac_memory_multi(int cipher, 
+int pmac_memory_multi(int cipher,
                 const unsigned char *key, unsigned long  keylen,
                       unsigned char *out, unsigned long *outlen,
                 const unsigned char *in,  unsigned long  inlen, ...)
@@ -51,12 +49,12 @@ int pmac_memory_multi(int cipher,
    if (pmac == NULL) {
       return CRYPT_MEM;
    }
-   
+
    if ((err = pmac_init(pmac, cipher, key, keylen)) != CRYPT_OK) {
       goto LBL_ERR;
    }
    va_start(args, inlen);
-   curptr = in; 
+   curptr = in;
    curlen = inlen;
    for (;;) {
       /* process buf */
@@ -79,11 +77,11 @@ LBL_ERR:
 #endif
    XFREE(pmac);
    va_end(args);
-   return err;   
+   return err;
 }
 
 #endif
 
-/* $Source$ */
-/* $Revision$ */
-/* $Date$ */
+/* ref:         $Format:%D$ */
+/* git commit:  $Format:%H$ */
+/* commit time: $Format:%ai$ */