From 4f2eb1914bdac3ed3ee504ad86061281dbe0d074 Mon Sep 17 00:00:00 2001
From: Matt Johnston <matt@ucc.asn.au>
Date: Fri, 9 Feb 2018 21:44:05 +0800
Subject: Update to libtomcrypt 1.18.1, merged with Dropbear changes

---
 libtomcrypt/src/modes/ctr/ctr_setiv.c | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

(limited to 'libtomcrypt/src/modes/ctr/ctr_setiv.c')

diff --git a/libtomcrypt/src/modes/ctr/ctr_setiv.c b/libtomcrypt/src/modes/ctr/ctr_setiv.c
index 56a3c97..64d73a1 100644
--- a/libtomcrypt/src/modes/ctr/ctr_setiv.c
+++ b/libtomcrypt/src/modes/ctr/ctr_setiv.c
@@ -5,8 +5,6 @@
  *
  * 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"
 
@@ -14,12 +12,12 @@
   @file ctr_setiv.c
   CTR implementation, set IV, Tom St Denis
 */
-  
+
 #ifdef LTC_CTR_MODE
 
 /**
-   Set an initial vector
-   @param IV   The initial vector
+   Set an initialization vector
+   @param IV   The initialization vector
    @param len  The length of the vector (in octets)
    @param ctr  The CTR state
    @return CRYPT_OK if successful
@@ -27,7 +25,7 @@
 int ctr_setiv(const unsigned char *IV, unsigned long len, symmetric_CTR *ctr)
 {
    int err;
-   
+
    LTC_ARGCHK(IV  != NULL);
    LTC_ARGCHK(ctr != NULL);
 
@@ -35,22 +33,22 @@ int ctr_setiv(const unsigned char *IV, unsigned long len, symmetric_CTR *ctr)
    if ((err = cipher_is_valid(ctr->cipher)) != CRYPT_OK) {
       return err;
    }
-   
+
    if (len != (unsigned long)ctr->blocklen) {
       return CRYPT_INVALID_ARG;
    }
 
    /* set IV */
    XMEMCPY(ctr->ctr, IV, len);
-   
+
    /* force next block */
    ctr->padlen = 0;
    return cipher_descriptor[ctr->cipher].ecb_encrypt(IV, ctr->pad, &ctr->key);
 }
 
-#endif 
+#endif
 
 
-/* $Source$ */
-/* $Revision$ */
-/* $Date$ */
+/* ref:         $Format:%D$ */
+/* git commit:  $Format:%H$ */
+/* commit time: $Format:%ai$ */
-- 
cgit v1.2.3