From: Loup Vaillant Date: Thu, 29 Sep 2016 20:45:27 +0000 (+0200) Subject: added poly1305 test vectors, fixed blake2b test X-Git-Url: https://git.codecow.com/?a=commitdiff_plain;h=d5e4e4e82020b9cf2dc65f5cebe464817f296b40;p=Monocypher.git added poly1305 test vectors, fixed blake2b test --- diff --git a/build.sh b/build.sh index 8458408..59cc66d 100755 --- a/build.sh +++ b/build.sh @@ -8,5 +8,5 @@ $CC $CFLAGS -c blake2b.c $CC $CFLAGS -c poly1305.c $CC $CFLAGS -c test.c -$CC $CFLAGS -o test test.o chacha20.o blake2b.o +$CC $CFLAGS -o test test.o chacha20.o blake2b.o poly1305.o $CC $CFLAGS -o speed_blake2b speed_blake2b.c blake2b.o diff --git a/test.c b/test.c index 998a479..4429a6e 100644 --- a/test.c +++ b/test.c @@ -5,6 +5,7 @@ #include #include "chacha20.h" #include "blake2b.h" +#include "poly1305.h" ///////////////////////// /// General utilities /// @@ -61,14 +62,21 @@ vec_new(size_t buf_size) } static vector -vec_zero(size_t size) +vec_uninitialized(size_t size) { vector v = vec_new(size); - memset(v.buffer, 0, size); v.size = size; return v; } +static vector +vec_zero(size_t size) +{ + vector v = vec_uninitialized(size); + memset(v.buffer, 0, size); + return v; +} + static void vec_del(vector *v) { @@ -148,11 +156,11 @@ test_blake2b(char* filename) vector in = read_hex_line(file); vector key = read_hex_line(file); vector hash = read_hex_line(file); - vector out = vec_new(hash.size); + vector out = vec_uninitialized(hash.size); - crypto_general_blake2b(out.buffer, out.size, - key.buffer, key.size, - in .buffer, in .size); + crypto_general_blake2b(out.buffer, hash.size, + key.buffer, key .size, + in .buffer, in .size); status |= memcmp(out.buffer, hash.buffer, out.size); vec_del(&out); @@ -165,10 +173,35 @@ test_blake2b(char* filename) return status; } +static int +test_poly1305(char *filename) +{ + int status = 0; + FILE *file = file_open(filename); + while (getc(file) != EOF) { + vector key = read_hex_line(file); + vector msg = read_hex_line(file); + vector tag = read_hex_line(file); + vector out = vec_uninitialized(tag.size); + + crypto_poly1305_auth(out.buffer, msg.buffer, msg.size, key.buffer); + status |= memcmp(out.buffer, tag.buffer, out.size); + + vec_del(&out); + vec_del(&tag); + vec_del(&msg); + vec_del(&key); + } + printf("%s: poly1305\n", status != 0 ? "FAILED" : "OK"); + fclose(file); + return status; +} + int main(void) { int status = 0; status |= test_chacha20("vectors_chacha20.txt"); status |= test_blake2b ("vectors_blake2b.txt" ); + status |= test_poly1305("vectors_poly1305.txt"); return status; } diff --git a/vectors_poly1305.txt b/vectors_poly1305.txt new file mode 100644 index 0000000..b60db74 --- /dev/null +++ b/vectors_poly1305.txt @@ -0,0 +1,43 @@ +key: 0000000000000000000000000000000000000000000000000000000000000000 +msg: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +tag: 00000000000000000000000000000000 + +key: 0000000000000000000000000000000036e5f6b5c5e06070f0efca96227a863e +msg: 416e79207375626d697373696f6e20746f20746865204945544620696e74656e6465642062792074686520436f6e7472696275746f7220666f72207075626c69636174696f6e20617320616c6c206f722070617274206f6620616e204945544620496e7465726e65742d4472616674206f722052464320616e6420616e792073746174656d656e74206d6164652077697468696e2074686520636f6e74657874206f6620616e204945544620616374697669747920697320636f6e7369646572656420616e20224945544620436f6e747269627574696f6e222e20537563682073746174656d656e747320696e636c756465206f72616c2073746174656d656e747320696e20494554462073657373696f6e732c2061732077656c6c206173207772697474656e20616e6420656c656374726f6e696320636f6d6d756e69636174696f6e73206d61646520617420616e792074696d65206f7220706c6163652c207768696368206172652061646472657373656420746f +tag: 36e5f6b5c5e06070f0efca96227a863e + +key: 36e5f6b5c5e06070f0efca96227a863e00000000000000000000000000000000 +msg: 416e79207375626d697373696f6e20746f20746865204945544620696e74656e6465642062792074686520436f6e7472696275746f7220666f72207075626c69636174696f6e20617320616c6c206f722070617274206f6620616e204945544620496e7465726e65742d4472616674206f722052464320616e6420616e792073746174656d656e74206d6164652077697468696e2074686520636f6e74657874206f6620616e204945544620616374697669747920697320636f6e7369646572656420616e20224945544620436f6e747269627574696f6e222e20537563682073746174656d656e747320696e636c756465206f72616c2073746174656d656e747320696e20494554462073657373696f6e732c2061732077656c6c206173207772697474656e20616e6420656c656374726f6e696320636f6d6d756e69636174696f6e73206d61646520617420616e792074696d65206f7220706c6163652c207768696368206172652061646472657373656420746f +tag: f3477e7cd95417af89a6b8794c310cf0 + +key: 1c9240a5eb55d38af333888604f6b5f0473917c1402b80099dca5cbc207075c0 +msg: 2754776173206272696c6c69672c20616e642074686520736c6974687920746f7665730a446964206779726520616e642067696d626c6520696e2074686520776162653a0a416c6c206d696d737920776572652074686520626f726f676f7665732c0a416e6420746865206d6f6d65207261746873206f757467726162652e +tag: 4541669a7eaaee61e708dc7cbcc5eb62 + +key: 0200000000000000000000000000000000000000000000000000000000000000 +msg: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF +tag: 03000000000000000000000000000000 + +key: 02000000000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF +msg: 02000000000000000000000000000000 +tag: 03000000000000000000000000000000 + +key: 0100000000000000000000000000000000000000000000000000000000000000 +msg: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF11000000000000000000000000000000 +tag: 05000000000000000000000000000000 + +key: 0100000000000000000000000000000000000000000000000000000000000000 +msg: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFBFEFEFEFEFEFEFEFEFEFEFEFEFEFEFE01010101010101010101010101010101 +tag: 00000000000000000000000000000000 + +key: 0200000000000000000000000000000000000000000000000000000000000000 +msg: FDFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF +tag: FAFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF + +key: 0100000000000000040000000000000000000000000000000000000000000000 +msg: E33594D7505E43B900000000000000003394D7505E4379CD01000000000000000000000000000000000000000000000001000000000000000000000000000000 +tag: 14000000000000005500000000000000 + +key: 0100000000000000040000000000000000000000000000000000000000000000 +msg: E33594D7505E43B900000000000000003394D7505E4379CD010000000000000000000000000000000000000000000000 +tag: 13000000000000000000000000000000