/////////////////////////
/// General utilities ///
/////////////////////////
-static void*
-alloc(size_t size)
+static void* alloc(size_t size)
{
void *buffer = malloc(size);
if (buffer == NULL) {
return buffer;
}
-static FILE*
-file_open(char *filename)
+static FILE* file_open(char *filename)
{
FILE *file = fopen(filename, "r");
if (file == NULL) {
return file;
}
-static unsigned
-uint_of_char(unsigned char c)
+static unsigned uint_of_char(unsigned char c)
{
if (c >= '0' && c <= '9') { return c - '0'; }
if (c >= 'a' && c <= 'f') { return c - 'a' + 10; }
size_t size;
} vector;
-static vector
-vec_new(size_t buf_size)
+static vector vec_new(size_t buf_size)
{
vector v;
v.buffer = alloc(buf_size);
return v;
}
-static vector
-vec_uninitialized(size_t size)
+static vector vec_uninitialized(size_t size)
{
vector v = vec_new(size);
v.size = size;
return v;
}
-static void
-vec_del(vector *v)
+static void vec_del(vector *v)
{
free(v->buffer);
}
-static void
-vec_push_back(vector *v, uint8_t e)
+static void vec_push_back(vector *v, uint8_t e)
{
if (v->buf_size == v->size) {
// double initial buffer size (and then some)
v->size++;
}
-static int
-vec_cmp(const vector *u, const vector *v)
+static int vec_cmp(const vector *u, const vector *v)
{
if (u->size != v-> size)
return -1;
// Read a line into a vector
// Free the vector's memory with vec_del()
-static vector
-read_hex_line(FILE *input_file)
+static vector read_hex_line(FILE *input_file)
{
char c = getc(input_file);
while (c != '\t') {
///////////////////////////
/// Test the test suite ///
///////////////////////////
-static int
-test_test_equal(char* filename)
+static int meta(int (*f)(int), char *filename)
{
int status = 0;
FILE *file = file_open(filename);
while (getc(file) != EOF) {
vector a = read_hex_line(file);
vector b = read_hex_line(file);
- status |= vec_cmp(&a, &b);
+ status |= f(vec_cmp(&a, &b));
vec_del(&b);
vec_del(&a);
}
- printf("%s: test_equal\n", status != 0 ? "FAILED" : "OK");
- fclose(file);
- return status;
-}
-
-static int
-test_test_diff(char* filename)
-{
- int status = 0;
- FILE *file = file_open(filename);
- while (getc(file) != EOF) {
- vector a = read_hex_line(file);
- vector b = read_hex_line(file);
- status |= !vec_cmp(&a, &b);
- vec_del(&b);
- vec_del(&a);
- }
- printf("%s: test_diff\n", status != 0 ? "FAILED" : "OK");
+ printf("%s: %s\n", status != 0 ? "FAILED" : "OK", filename);
fclose(file);
return status;
}
+static int equal(int status) { return status; }
+static int diff (int status) { return !status; }
////////////////////////
/// The tests proper ///
////////////////////////
-static int
-test_chacha20(char* filename)
+static int test(void (*f)(const vector[], vector*),
+ char *filename, size_t nb_vectors)
{
- int status = 0;
- FILE *file = file_open(filename);
- while (getc(file) != EOF) {
- vector key = read_hex_line(file);
- vector nonce = read_hex_line(file);
- vector stream = read_hex_line(file);
- vector out = vec_uninitialized(stream.size);
-
- crypto_chacha_ctx ctx;
- crypto_chacha20_init(&ctx, key.buffer, nonce.buffer);
- crypto_chacha20_random(&ctx, out.buffer, out.size);
- status |= vec_cmp(&out, &stream);
+ int status = 0;
+ FILE *file = file_open(filename);
+ vector *inputs = alloc(nb_vectors * sizeof(vector));
- vec_del(&out);
- vec_del(&stream);
- vec_del(&nonce);
- vec_del(&key);
+ while (getc(file) != EOF) {
+ for (size_t i = 0; i < nb_vectors; i++)
+ inputs[i] = read_hex_line(file);
+
+ vector expected = read_hex_line(file);
+ vector output = vec_uninitialized(expected.size);
+ f(inputs, &output);
+ status |= vec_cmp(&output, &expected);
+
+ vec_del(&output);
+ vec_del(&expected);
+ for (size_t i = 0; i < nb_vectors; i++)
+ vec_del(inputs + i);
}
- printf("%s: chacha20\n", status != 0 ? "FAILED" : "OK");
+ printf("%s: %s\n", status != 0 ? "FAILED" : "OK", filename);
+ free(inputs);
fclose(file);
return status;
}
-static int
-test_blake2b(char* filename)
+static void chacha20(const vector in[], vector *out)
{
- int status = 0;
- FILE *file = file_open(filename);
- while (getc(file) != EOF) {
- vector in = read_hex_line(file);
- vector key = read_hex_line(file);
- vector hash = read_hex_line(file);
- vector out = vec_uninitialized(hash.size);
-
- crypto_blake2b_general(out.buffer, hash.size,
- key.buffer, key .size,
- in .buffer, in .size);
-
- status |= vec_cmp(&out, &hash);
-
- vec_del(&out);
- vec_del(&hash);
- vec_del(&key);
- vec_del(&in);
- }
- printf("%s: blake2b\n", status != 0 ? "FAILED" : "OK");
- fclose(file);
- return status;
+ const vector *key = in;
+ const vector *nonce = in + 1;
+ crypto_chacha_ctx ctx;
+ crypto_chacha20_init(&ctx, key->buffer, nonce->buffer);
+ crypto_chacha20_random(&ctx, out->buffer, out->size);
}
-static int
-test_poly1305(char *filename)
+static void blake2b(const vector in[], vector *out)
{
- 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 |= vec_cmp(&out, &tag);
-
- vec_del(&out);
- vec_del(&tag);
- vec_del(&msg);
- vec_del(&key);
- }
- printf("%s: poly1305\n", status != 0 ? "FAILED" : "OK");
- fclose(file);
- return status;
+ const vector *msg = in;
+ const vector *key = in + 1;
+ crypto_blake2b_general(out->buffer, out->size,
+ key->buffer, key->size,
+ msg->buffer, msg->size);
}
-static int
-test_argon2i(char *filename)
+static void poly1305(const vector in[], vector *out)
{
- int status = 0;
- FILE *file = file_open(filename);
- while (getc(file) != EOF) {
- vector nb_blocks = read_hex_line(file);
- vector nb_iterations = read_hex_line(file);
- vector password = read_hex_line(file);
- vector salt = read_hex_line(file);
- vector key = read_hex_line(file);
- vector ad = read_hex_line(file);
- vector tag = read_hex_line(file);
- vector out = vec_uninitialized(tag.size);
-
- void *work_area = malloc(nb_blocks.buffer[0] * 1024);
+ const vector *key = in;
+ const vector *msg = in + 1;
+ crypto_poly1305_auth(out->buffer, msg->buffer, msg->size, key->buffer);
+}
- crypto_argon2i_hash(out .buffer, out .size,
- password.buffer, password.size,
- salt .buffer, salt .size,
- key .buffer, key .size,
- ad .buffer, ad .size,
+static void argon2i(const vector in[], vector *out)
+{
+ const vector *nb_blocks = in;
+ const vector *nb_iterations = in + 1;
+ const vector *password = in + 2;
+ const vector *salt = in + 3;
+ const vector *key = in + 4;
+ const vector *ad = in + 5;
+ void *work_area = alloc(nb_blocks->buffer[0] * 1024);
+ crypto_argon2i_hash(out ->buffer, out ->size,
+ password->buffer, password->size,
+ salt ->buffer, salt ->size,
+ key ->buffer, key ->size,
+ ad ->buffer, ad ->size,
work_area,
- nb_blocks .buffer[0],
- nb_iterations.buffer[0]);
-
- status |= vec_cmp(&out, &tag);
-
+ nb_blocks ->buffer[0],
+ nb_iterations->buffer[0]);
free(work_area);
- vec_del(&nb_blocks );
- vec_del(&nb_iterations);
- vec_del(&password );
- vec_del(&salt );
- vec_del(&key );
- vec_del(&ad );
- vec_del(&tag );
- vec_del(&out );
- }
- printf("%s: argon2i\n", status != 0 ? "FAILED" : "OK");
- fclose(file);
- return status;
}
-static int
-test_ae()
+static int test_ae()
{
- uint8_t key[32] = {
- 0, 1, 2, 3, 4, 5, 6, 7,
- 0, 1, 2, 3, 4, 5, 6, 7,
- 0, 1, 2, 3, 4, 5, 6, 7,
- 0, 1, 2, 3, 4, 5, 6, 7
- };
- uint8_t nonce[24] = {
- 0, 1, 2, 3, 4, 5, 6, 7,
- 0, 1, 2, 3, 4, 5, 6, 7,
- 0, 1, 2, 3, 4, 5, 6, 7
- };
+ uint8_t key[32] = { 0, 1, 2, 3, 4, 5, 6, 7, 0, 1, 2, 3, 4, 5, 6, 7,
+ 0, 1, 2, 3, 4, 5, 6, 7, 0, 1, 2, 3, 4, 5, 6, 7 };
+ uint8_t nonce[24] = { 0, 1, 2, 3, 4, 5, 6, 7, 0, 1, 2, 3, 4, 5, 6, 7,
+ 0, 1, 2, 3, 4, 5, 6, 7 };
uint8_t plaintext[8] = { 0, 1, 2, 3, 4, 5, 6, 7 };
- uint8_t box[24] = {
- 0, 1, 2, 3, 4, 5, 6, 7,
- 0, 1, 2, 3, 4, 5, 6, 7,
- 0, 1, 2, 3, 4, 5, 6, 7
- };
+ uint8_t box[24] = { 0, 1, 2, 3, 4, 5, 6, 7, 0, 1, 2, 3, 4, 5, 6, 7,
+ 0, 1, 2, 3, 4, 5, 6, 7 };
uint8_t out[8];
crypto_ae_lock(key, nonce, plaintext, 8, box);
int main(void)
{
int status = 0;
- status |= test_test_equal("vectors_test_equal.txt");
- status |= test_test_diff ("vectors_test_diff.txt" );
- status |= test_chacha20 ("vectors_chacha20.txt" );
- status |= test_blake2b ("vectors_blake2b.txt" );
- status |= test_poly1305 ("vectors_poly1305.txt" );
- status |= test_argon2i ("vectors_argon2i.txt" );
- status |= test_ae ( );
+ status |= meta(equal, "vectors_test_equal.txt" );
+ status |= meta(diff, "vectors_test_diff.txt" );
+ status |= test(chacha20, "vectors_chacha20.txt", 2);
+ status |= test(blake2b , "vectors_blake2b.txt" , 2);
+ status |= test(poly1305, "vectors_poly1305.txt", 2);
+ status |= test(argon2i , "vectors_argon2i.txt" , 6);
+ status |= test_ae();
printf(status ? "TESTS FAILED\n" : "ALL TESTS OK\n");
return status;
}
projects / Monocypher.git / commitdiff