speed-sodium uses utils

diff --git a/makefile b/makefile
index c498a11442981f9131c3933bed761f057867fd81..3b2b1a1dac7bdd463fb5115d5997152eabdaac97 100644 (file)
--- a/makefile
+++ b/makefile
@@ -92,7 +92,7 @@ test.out : lib/test.o  lib/monocypher.o lib/sha512.o lib/utils.o
 speed.out: lib/speed.o lib/monocypher.o lib/sha512.o lib/utils.o
 test.out speed.out:
        $(CC) $(CFLAGS) -I src -I src/optional -o $@ $^
-speed-sodium.out: tests/speed-sodium.c
+speed-sodium.out: tests/speed-sodium.c lib/utils.o
        $(CC) $(CFLAGS) -I src -I src/optional -o $@ $^ \
             $$(pkg-config --cflags libsodium)           \
             $$(pkg-config --libs   libsodium)

diff --git a/tests/speed-sodium.c b/tests/speed-sodium.c
index 4fa234e1d2297a6a0205744f8b26f065af1dcb3c..97e174710b9542c7ba82e8448c410d6930929901 100644 (file)
--- a/tests/speed-sodium.c
+++ b/tests/speed-sodium.c
@@ -3,19 +3,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "sodium.h"
-
-// Copied from utils.h
-#include <inttypes.h>
-#include <stddef.h>
-typedef int8_t   i8;
-typedef uint8_t  u8;
-typedef uint32_t u32;
-typedef int32_t  i32;
-typedef int64_t  i64;
-typedef uint64_t u64;
-#define FOR(i, start, end) for (size_t (i) = (start); (i) < (end); (i)++)
-#define RANDOM_INPUT(name, size) u8 name[size]; p_random(name, size)
-// end of copy from utils.h
+#include "utils.h"
 
 typedef struct timespec timespec;
 
@@ -78,17 +66,6 @@ static void print(const char *name, u64 speed, const char *unit)
     } /* end FOR*/                              \
     return speed(duration)
 
-
-// not random at all, it's just to measure the speed
-void p_random(u8 *buf, size_t size)
-{
-    static u8 v = 57; // barely random variable
-    FOR (i, 0, size) {
-        buf[i] = v;
-        v *= 57;
-    }
-}
-
 static u64 chacha20(void)
 {
     static u8  in   [SIZE];  p_random(in   , SIZE);