Merge pull request #270 from libtom/minor_changes

Minor changes

Author: sjaeckel

src/stream/chacha/chacha_setup.c

@@ -35,6 +35,8 @@ int chacha_setup(chacha_state *st, const unsigned char *key, unsigned long keyle
    LTC_ARGCHK(key != NULL);
    LTC_ARGCHK(keylen == 32 || keylen == 16);
 
+   if (rounds == 0) rounds = 20;
+
    LOAD32L(st->input[4], key + 0);
    LOAD32L(st->input[5], key + 4);
    LOAD32L(st->input[6], key + 8);

tests/test.c

@@ -73,8 +73,7 @@ static ulong64 epoch_usec(void)
   return cur_time;
 #else
   struct timeval tv;
-  struct timezone tz;
-  gettimeofday(&tv, &tz);
+  gettimeofday(&tv, NULL);
   return (ulong64)(tv.tv_sec) * 1000000 + (ulong64)(tv.tv_usec); /* get microseconds */
 #endif
 }