From 5b2f55d4d8d894b771608a325f128ef3bd0a7461 Mon Sep 17 00:00:00 2001 From: Loup Vaillant Date: Thu, 5 Dec 2019 22:07:26 +0100 Subject: [PATCH] Prefixed optional files with "monocypher-" Monocypher is a "single file" library, with optional files. As a single file library, it is best to occupy the global namespace directly. It's only one include, no need for a folder. The optional file kinda throw things off. We could put it in a sub-folder, but we probably want both header to be at the same place. And we certainly don't want to put monocypher.h itself in sub-folder. The solution is to have those files, none in a sub folder. monocypher.h monocypher.c monocypher-ed25519.h (optional) monocypher-ed25519.c (optional) Namespace pollution is limited to a prefix. Should be reasonable both for projects that import those files directly, or for packaging in a Linux or BSD distribution. --- README.md | 6 +- makefile | 32 ++-- src/optional/ed25519.c | 345 --------------------------------------- src/optional/ed25519.h | 88 ---------- tests/formal-analysis.sh | 16 +- tests/speed/speed.c | 2 +- tests/test.c | 2 +- 7 files changed, 29 insertions(+), 462 deletions(-) delete mode 100644 src/optional/ed25519.c delete mode 100644 src/optional/ed25519.h diff --git a/README.md b/README.md index 160f925..5e39f34 100644 --- a/README.md +++ b/README.md @@ -151,9 +151,9 @@ Customisation ------------- Monocypher has optional compatibility with Ed25519. To have that, add -`ed25519.h` and `ed25519.c` provided in `src/optional` to your project. -If you're using the makefile, define the `USE_ED25519` variable to link -it to monocypher.a and monocypher.so: +`monocypher-ed25519.h` and `monocypher-ed25519.c` provided in +`src/optional` to your project. If you're using the makefile, define +the `USE_ED25519` variable to link it to monocypher.a and monocypher.so: $ make USE_ED25519=true diff --git a/makefile b/makefile index ad38e83..01ee6c6 100644 --- a/makefile +++ b/makefile @@ -9,8 +9,8 @@ SONAME=libmonocypher.so.3 VERSION=__git__ ifdef USE_ED25519 -LINK_ED25519=lib/ed25519.o -INSTALL_ED25519=cp src/optional/ed25519.h $(DESTDIR)/$(PREFIX)/include +LINK_ED25519=lib/monocypher-ed25519.o +INSTALL_ED25519=cp src/optional/monocypher-ed25519.h $(DESTDIR)/$(PREFIX)/include endif .PHONY: all library static-library dynamic-library \ @@ -101,16 +101,17 @@ lib/libmonocypher.so: lib/$(SONAME) lib/$(SONAME): lib/monocypher.o $(LINK_ED25519) @mkdir -p $(@D) $(CC) $(CFLAGS) -shared -Wl,-soname,$(SONAME) -o $@ $^ -lib/ed25519.o : src/optional/ed25519.c src/optional/ed25519.h +lib/monocypher-ed25519.o: src/optional/monocypher-ed25519.c \ + src/optional/monocypher-ed25519.h lib/chacha20.o : src/deprecated/chacha20.c src/deprecated/chacha20.h lib/aead-incr.o : src/deprecated/aead-incr.c src/deprecated/aead-incr.h lib/monocypher.o: src/monocypher.c src/monocypher.h -lib/monocypher.o lib/ed25519.o lib/chacha20.o lib/aead-incr.o: +lib/monocypher.o lib/monocypher-ed25519.o lib/chacha20.o lib/aead-incr.o: @mkdir -p $(@D) $(CC) $(CFLAGS) -I src -I src/optional -fPIC -c -o $@ $< # Test & speed libraries -TEST_COMMON = tests/utils.h src/monocypher.h src/optional/ed25519.h +TEST_COMMON = tests/utils.h src/monocypher.h src/optional/monocypher-ed25519.h TEST_LEGACY = $(TEST_COMMON) src/deprecated/chacha20.h src/deprecated/aead-incr.h SPEED = tests/speed lib/utils.o :tests/utils.c @@ -139,16 +140,15 @@ lib/speed-hydrogen.o:$(SPEED)/speed-hydrogen.c $(TEST_COMMON) $(SPEED)/speed.h -fPIC -c -o $@ $< C25519= c25519 edsign ed25519 morph25519 fprime f25519 sha512 -C25519_SOURCE= $(patsubst %, tests/externals/c25519/%.c, $(C25519)) -C25519_HEADERS= $(patsubst %, tests/externals/c25519/%.h, $(C25519)) +C25519_H= $(patsubst %, tests/externals/c25519/%.h, $(C25519)) C25519_OBJECTS= $(patsubst %, lib/c25519/%.o, $(C25519)) -lib/c25519/c25519.o : tests/externals/c25519/c25519.c $(C25519_HEADERS) -lib/c25519/ed25519.o : tests/externals/c25519/ed25519.c $(C25519_HEADERS) -lib/c25519/edsign.o : tests/externals/c25519/edsign.c $(C25519_HEADERS) -lib/c25519/f25519.o : tests/externals/c25519/f25519.c $(C25519_HEADERS) -lib/c25519/fprime.o : tests/externals/c25519/fprime.c $(C25519_HEADERS) -lib/c25519/morph25519.o: tests/externals/c25519/morph25519.c $(C25519_HEADERS) -lib/c25519/sha512.o : tests/externals/c25519/sha512.c $(C25519_HEADERS) +lib/c25519/c25519.o : tests/externals/c25519/c25519.c $(C25519_H) +lib/c25519/ed25519.o : tests/externals/c25519/monocypher-ed25519.c $(C25519_H) +lib/c25519/edsign.o : tests/externals/c25519/edsign.c $(C25519_H) +lib/c25519/f25519.o : tests/externals/c25519/f25519.c $(C25519_H) +lib/c25519/fprime.o : tests/externals/c25519/fprime.c $(C25519_H) +lib/c25519/morph25519.o: tests/externals/c25519/morph25519.c $(C25519_H) +lib/c25519/sha512.o : tests/externals/c25519/sha512.c $(C25519_H) $(C25519_OBJECTS): @mkdir -p $(@D) $(CC) $(CFLAGS) -I tests/externals/c25519/ -c -o $@ $< @@ -163,9 +163,9 @@ lib/speed-c25519.o:$(SPEED)/speed-c25519.c \ # test & speed executables TEST_OBJ= lib/utils.o lib/monocypher.o -test.out : lib/test.o $(TEST_OBJ) lib/ed25519.o +test.out : lib/test.o $(TEST_OBJ) lib/monocypher-ed25519.o test-legacy.out: lib/test-legacy.o $(TEST_OBJ) lib/chacha20.o lib/aead-incr.o -speed.out : lib/speed.o $(TEST_OBJ) lib/ed25519.o +speed.out : lib/speed.o $(TEST_OBJ) lib/monocypher-ed25519.o test.out test-legacy.out speed.out: $(CC) $(CFLAGS) -I src -I src/optional -o $@ $^ speed-sodium.out: lib/speed-sodium.o lib/utils.o diff --git a/src/optional/ed25519.c b/src/optional/ed25519.c deleted file mode 100644 index 979ffa9..0000000 --- a/src/optional/ed25519.c +++ /dev/null @@ -1,345 +0,0 @@ -// Monocypher version __git__ - -#include "ed25519.h" - -///////////////// -/// Utilities /// -///////////////// -#define FOR(i, min, max) for (size_t i = min; i < max; i++) -#define WIPE_CTX(ctx) crypto_wipe(ctx , sizeof(*(ctx))) -#define MIN(a, b) ((a) <= (b) ? (a) : (b)) -#define ALIGN(x, block_size) ((~(x) + 1) & ((block_size) - 1)) -typedef uint8_t u8; -typedef uint64_t u64; - -static u64 load64_be(const u8 s[8]) -{ - return((u64)s[0] << 56) - | ((u64)s[1] << 48) - | ((u64)s[2] << 40) - | ((u64)s[3] << 32) - | ((u64)s[4] << 24) - | ((u64)s[5] << 16) - | ((u64)s[6] << 8) - | (u64)s[7]; -} - -static void store64_be(u8 out[8], u64 in) -{ - out[0] = (in >> 56) & 0xff; - out[1] = (in >> 48) & 0xff; - out[2] = (in >> 40) & 0xff; - out[3] = (in >> 32) & 0xff; - out[4] = (in >> 24) & 0xff; - out[5] = (in >> 16) & 0xff; - out[6] = (in >> 8) & 0xff; - out[7] = in & 0xff; -} - -/////////////// -/// SHA 512 /// -/////////////// -static u64 rot(u64 x, int c ) { return (x >> c) | (x << (64 - c)); } -static u64 ch (u64 x, u64 y, u64 z) { return (x & y) ^ (~x & z); } -static u64 maj(u64 x, u64 y, u64 z) { return (x & y) ^ ( x & z) ^ (y & z); } -static u64 big_sigma0(u64 x) { return rot(x, 28) ^ rot(x, 34) ^ rot(x, 39); } -static u64 big_sigma1(u64 x) { return rot(x, 14) ^ rot(x, 18) ^ rot(x, 41); } -static u64 lit_sigma0(u64 x) { return rot(x, 1) ^ rot(x, 8) ^ (x >> 7); } -static u64 lit_sigma1(u64 x) { return rot(x, 19) ^ rot(x, 61) ^ (x >> 6); } - -static const u64 K[80] = { - 0x428a2f98d728ae22,0x7137449123ef65cd,0xb5c0fbcfec4d3b2f,0xe9b5dba58189dbbc, - 0x3956c25bf348b538,0x59f111f1b605d019,0x923f82a4af194f9b,0xab1c5ed5da6d8118, - 0xd807aa98a3030242,0x12835b0145706fbe,0x243185be4ee4b28c,0x550c7dc3d5ffb4e2, - 0x72be5d74f27b896f,0x80deb1fe3b1696b1,0x9bdc06a725c71235,0xc19bf174cf692694, - 0xe49b69c19ef14ad2,0xefbe4786384f25e3,0x0fc19dc68b8cd5b5,0x240ca1cc77ac9c65, - 0x2de92c6f592b0275,0x4a7484aa6ea6e483,0x5cb0a9dcbd41fbd4,0x76f988da831153b5, - 0x983e5152ee66dfab,0xa831c66d2db43210,0xb00327c898fb213f,0xbf597fc7beef0ee4, - 0xc6e00bf33da88fc2,0xd5a79147930aa725,0x06ca6351e003826f,0x142929670a0e6e70, - 0x27b70a8546d22ffc,0x2e1b21385c26c926,0x4d2c6dfc5ac42aed,0x53380d139d95b3df, - 0x650a73548baf63de,0x766a0abb3c77b2a8,0x81c2c92e47edaee6,0x92722c851482353b, - 0xa2bfe8a14cf10364,0xa81a664bbc423001,0xc24b8b70d0f89791,0xc76c51a30654be30, - 0xd192e819d6ef5218,0xd69906245565a910,0xf40e35855771202a,0x106aa07032bbd1b8, - 0x19a4c116b8d2d0c8,0x1e376c085141ab53,0x2748774cdf8eeb99,0x34b0bcb5e19b48a8, - 0x391c0cb3c5c95a63,0x4ed8aa4ae3418acb,0x5b9cca4f7763e373,0x682e6ff3d6b2b8a3, - 0x748f82ee5defb2fc,0x78a5636f43172f60,0x84c87814a1f0ab72,0x8cc702081a6439ec, - 0x90befffa23631e28,0xa4506cebde82bde9,0xbef9a3f7b2c67915,0xc67178f2e372532b, - 0xca273eceea26619c,0xd186b8c721c0c207,0xeada7dd6cde0eb1e,0xf57d4f7fee6ed178, - 0x06f067aa72176fba,0x0a637dc5a2c898a6,0x113f9804bef90dae,0x1b710b35131c471b, - 0x28db77f523047d84,0x32caab7b40c72493,0x3c9ebe0a15c9bebc,0x431d67c49c100d4c, - 0x4cc5d4becb3e42b6,0x597f299cfc657e2a,0x5fcb6fab3ad6faec,0x6c44198c4a475817 -}; - -static void sha512_compress(crypto_sha512_ctx *ctx) -{ - u64 a = ctx->hash[0]; u64 b = ctx->hash[1]; - u64 c = ctx->hash[2]; u64 d = ctx->hash[3]; - u64 e = ctx->hash[4]; u64 f = ctx->hash[5]; - u64 g = ctx->hash[6]; u64 h = ctx->hash[7]; - - FOR (j, 0, 16) { - u64 in = K[j] + ctx->input[j]; - u64 t1 = big_sigma1(e) + ch (e, f, g) + h + in; - u64 t2 = big_sigma0(a) + maj(a, b, c); - h = g; g = f; f = e; e = d + t1; - d = c; c = b; b = a; a = t1 + t2; - } - size_t i16 = 0; - FOR(i, 1, 5) { - i16 += 16; - FOR (j, 0, 16) { - ctx->input[j] += lit_sigma1(ctx->input[(j- 2) & 15]); - ctx->input[j] += lit_sigma0(ctx->input[(j-15) & 15]); - ctx->input[j] += ctx->input[(j- 7) & 15]; - u64 in = K[i16 + j] + ctx->input[j]; - u64 t1 = big_sigma1(e) + ch (e, f, g) + h + in; - u64 t2 = big_sigma0(a) + maj(a, b, c); - h = g; g = f; f = e; e = d + t1; - d = c; c = b; b = a; a = t1 + t2; - } - } - - ctx->hash[0] += a; ctx->hash[1] += b; - ctx->hash[2] += c; ctx->hash[3] += d; - ctx->hash[4] += e; ctx->hash[5] += f; - ctx->hash[6] += g; ctx->hash[7] += h; -} - -static void sha512_set_input(crypto_sha512_ctx *ctx, u8 input) -{ - if (ctx->input_idx == 0) { - FOR (i, 0, 16) { - ctx->input[i] = 0; - } - } - size_t word = ctx->input_idx / 8; - size_t byte = ctx->input_idx % 8; - ctx->input[word] |= (u64)input << (8 * (7 - byte)); -} - -// increment a 128-bit "word". -static void sha512_incr(u64 x[2], u64 y) -{ - x[1] += y; - if (x[1] < y) { - x[0]++; - } -} - -static void sha512_end_block(crypto_sha512_ctx *ctx) -{ - if (ctx->input_idx == 128) { - sha512_incr(ctx->input_size, 1024); // size is in bits - sha512_compress(ctx); - ctx->input_idx = 0; - } -} - -static void sha512_update(crypto_sha512_ctx *ctx, - const u8 *message, size_t message_size) -{ - FOR (i, 0, message_size) { - sha512_set_input(ctx, message[i]); - ctx->input_idx++; - sha512_end_block(ctx); - } -} - -void crypto_sha512_init(crypto_sha512_ctx *ctx) -{ - ctx->hash[0] = 0x6a09e667f3bcc908; - ctx->hash[1] = 0xbb67ae8584caa73b; - ctx->hash[2] = 0x3c6ef372fe94f82b; - ctx->hash[3] = 0xa54ff53a5f1d36f1; - ctx->hash[4] = 0x510e527fade682d1; - ctx->hash[5] = 0x9b05688c2b3e6c1f; - ctx->hash[6] = 0x1f83d9abfb41bd6b; - ctx->hash[7] = 0x5be0cd19137e2179; - ctx->input_size[0] = 0; - ctx->input_size[1] = 0; - ctx->input_idx = 0; -} - -void crypto_sha512_update(crypto_sha512_ctx *ctx, - const u8 *message, size_t message_size) -{ - // Align ourselves with block boundaries - size_t align = MIN(ALIGN(ctx->input_idx, 128), message_size); - sha512_update(ctx, message, align); - message += align; - message_size -= align; - - // Process the message block by block - FOR (i, 0, message_size / 128) { // number of blocks - FOR (j, 0, 16) { - ctx->input[j] = load64_be(message + j*8); - } - message += 128; - ctx->input_idx += 128; - sha512_end_block(ctx); - } - message_size &= 127; - - // remaining bytes - sha512_update(ctx, message, message_size); -} - -void crypto_sha512_final(crypto_sha512_ctx *ctx, u8 hash[64]) -{ - sha512_incr(ctx->input_size, ctx->input_idx * 8); // size is in bits - sha512_set_input(ctx, 128); // padding - - // compress penultimate block (if any) - if (ctx->input_idx > 111) { - sha512_compress(ctx); - FOR(i, 0, 14) { - ctx->input[i] = 0; - } - } - // compress last block - ctx->input[14] = ctx->input_size[0]; - ctx->input[15] = ctx->input_size[1]; - sha512_compress(ctx); - - // copy hash to output (big endian) - FOR (i, 0, 8) { - store64_be(hash + i*8, ctx->hash[i]); - } - - WIPE_CTX(ctx); -} - -void crypto_sha512(u8 hash[64], const u8 *message, size_t message_size) -{ - crypto_sha512_ctx ctx; - crypto_sha512_init (&ctx); - crypto_sha512_update(&ctx, message, message_size); - crypto_sha512_final (&ctx, hash); -} - -static void sha512_vtable_init(void *ctx) -{ - crypto_sha512_init(&((crypto_sign_ed25519_ctx*)ctx)->hash); -} - -static void sha512_vtable_update(void *ctx, const u8 *m, size_t s) -{ - crypto_sha512_update(&((crypto_sign_ed25519_ctx*)ctx)->hash, m, s); -} - -static void sha512_vtable_final(void *ctx, u8 *h) -{ - crypto_sha512_final(&((crypto_sign_ed25519_ctx*)ctx)->hash, h); -} - -const crypto_sign_vtable crypto_sha512_vtable = { - crypto_sha512, - sha512_vtable_init, - sha512_vtable_update, - sha512_vtable_final, - sizeof(crypto_sign_ed25519_ctx), -}; - -//////////////////// -/// HMAC SHA 512 /// -//////////////////// -void crypto_hmac_sha512_init(crypto_hmac_sha512_ctx *ctx, - const u8 *key, size_t key_size) -{ - // hash key if it is too long - if (key_size > 128) { - crypto_sha512(ctx->key, key, key_size); - key = ctx->key; - key_size = 64; - } - // Compute inner key: padded key XOR 0x36 - FOR (i, 0, key_size) { ctx->key[i] = key[i] ^ 0x36; } - FOR (i, key_size, 128) { ctx->key[i] = 0x36; } - // Start computing inner hash - crypto_sha512_init (&ctx->ctx); - crypto_sha512_update(&ctx->ctx, ctx->key, 128); -} - -void crypto_hmac_sha512_update(crypto_hmac_sha512_ctx *ctx, - const u8 *message, size_t message_size) -{ - crypto_sha512_update(&ctx->ctx, message, message_size); -} - -void crypto_hmac_sha512_final(crypto_hmac_sha512_ctx *ctx, u8 hmac[64]) -{ - // Finish computing inner hash - crypto_sha512_final(&ctx->ctx, hmac); - // Compute outer key: padded key XOR 0x5c - FOR (i, 0, 128) { - ctx->key[i] ^= 0x36 ^ 0x5c; - } - // Compute outer hash - crypto_sha512_init (&ctx->ctx); - crypto_sha512_update(&ctx->ctx, ctx->key , 128); - crypto_sha512_update(&ctx->ctx, hmac, 64); - crypto_sha512_final (&ctx->ctx, hmac); // outer hash - WIPE_CTX(ctx); -} - -void crypto_hmac_sha512(u8 hmac[64], const u8 *key, size_t key_size, - const u8 *message, size_t message_size) -{ - crypto_hmac_sha512_ctx ctx; - crypto_hmac_sha512_init (&ctx, key, key_size); - crypto_hmac_sha512_update(&ctx, message, message_size); - crypto_hmac_sha512_final (&ctx, hmac); -} - - -/////////////// -/// Ed25519 /// -/////////////// - -void crypto_ed25519_public_key(u8 public_key[32], - const u8 secret_key[32]) -{ - crypto_sign_public_key_custom_hash(public_key, secret_key, - &crypto_sha512_vtable); -} - -void crypto_ed25519_sign_init_first_pass(crypto_sign_ctx_abstract *ctx, - const u8 secret_key[32], - const u8 public_key[32]) -{ - crypto_sign_init_first_pass_custom_hash(ctx, secret_key, public_key, - &crypto_sha512_vtable); -} - -void crypto_ed25519_check_init(crypto_check_ctx_abstract *ctx, - const u8 signature[64], - const u8 public_key[32]) -{ - crypto_check_init_custom_hash(ctx, signature, public_key, - &crypto_sha512_vtable); -} - -void crypto_ed25519_sign(u8 signature [64], - const u8 secret_key[32], - const u8 public_key[32], - const u8 *message, size_t message_size) -{ - crypto_sign_ed25519_ctx ctx; - crypto_ed25519_sign_init_first_pass ((void*)&ctx, secret_key, public_key); - crypto_ed25519_sign_update ((void*)&ctx, message, message_size); - crypto_ed25519_sign_init_second_pass((void*)&ctx); - crypto_ed25519_sign_update ((void*)&ctx, message, message_size); - crypto_ed25519_sign_final ((void*)&ctx, signature); - -} - -int crypto_ed25519_check(const u8 signature [64], - const u8 public_key[32], - const u8 *message, size_t message_size) -{ - crypto_check_ed25519_ctx ctx; - crypto_ed25519_check_init((void*)&ctx, signature, public_key); - crypto_ed25519_check_update((void*)&ctx, message, message_size); - return crypto_ed25519_check_final((void*)&ctx); -} - diff --git a/src/optional/ed25519.h b/src/optional/ed25519.h deleted file mode 100644 index 33be482..0000000 --- a/src/optional/ed25519.h +++ /dev/null @@ -1,88 +0,0 @@ -// Monocypher version __git__ - -#ifndef ED25519_H -#define ED25519_H - -#include "monocypher.h" - -//////////////////////// -/// Type definitions /// -//////////////////////// - -// Do not rely on the size or content on any of those types, -// they may change without notice. -typedef struct { - uint64_t hash[8]; - uint64_t input[16]; - uint64_t input_size[2]; - size_t input_idx; -} crypto_sha512_ctx; - -typedef struct { - uint8_t key[128]; - crypto_sha512_ctx ctx; -} crypto_hmac_sha512_ctx; - -typedef struct { - crypto_sign_ctx_abstract ctx; - crypto_sha512_ctx hash; -} crypto_sign_ed25519_ctx; -typedef crypto_sign_ed25519_ctx crypto_check_ed25519_ctx; - -// SHA 512 -// ------- -void crypto_sha512_init (crypto_sha512_ctx *ctx); -void crypto_sha512_update(crypto_sha512_ctx *ctx, - const uint8_t *message, size_t message_size); -void crypto_sha512_final (crypto_sha512_ctx *ctx, uint8_t hash[64]); -void crypto_sha512(uint8_t hash[64], const uint8_t *message, size_t message_size); - -// vtable for signatures -extern const crypto_sign_vtable crypto_sha512_vtable; - - -// HMAC SHA 512 -// ------------ -void crypto_hmac_sha512_init(crypto_hmac_sha512_ctx *ctx, - const uint8_t *key, size_t key_size); -void crypto_hmac_sha512_update(crypto_hmac_sha512_ctx *ctx, - const uint8_t *message, size_t message_size); -void crypto_hmac_sha512_final(crypto_hmac_sha512_ctx *ctx, uint8_t hmac[64]); -void crypto_hmac_sha512(uint8_t hmac[64], - const uint8_t *key , size_t key_size, - const uint8_t *message, size_t message_size); - - -// Ed25519 -// ------- - -// Generate public key -void crypto_ed25519_public_key(uint8_t public_key[32], - const uint8_t secret_key[32]); - -// Direct interface -void crypto_ed25519_sign(uint8_t signature [64], - const uint8_t secret_key[32], - const uint8_t public_key[32], // optional, may be 0 - const uint8_t *message, size_t message_size); -int crypto_ed25519_check(const uint8_t signature [64], - const uint8_t public_key[32], - const uint8_t *message, size_t message_size); - -// Incremental interface -void crypto_ed25519_sign_init_first_pass(crypto_sign_ctx_abstract *ctx, - const uint8_t secret_key[32], - const uint8_t public_key[32]); -#define crypto_ed25519_sign_update crypto_sign_update -#define crypto_ed25519_sign_init_second_pass crypto_sign_init_second_pass -// use crypto_ed25519_sign_update() again. -#define crypto_ed25519_sign_final crypto_sign_final - -void crypto_ed25519_check_init(crypto_check_ctx_abstract *ctx, - const uint8_t signature[64], - const uint8_t public_key[32]); -#define crypto_ed25519_check_update crypto_check_update -#define crypto_ed25519_check_final crypto_check_final - - -#endif // ED25519_H diff --git a/tests/formal-analysis.sh b/tests/formal-analysis.sh index 93b4ef9..2dbbd5c 100755 --- a/tests/formal-analysis.sh +++ b/tests/formal-analysis.sh @@ -1,12 +1,12 @@ #! /bin/sh mkdir -p tests/formal-analysis -cp src/monocypher.c \ - src/monocypher.h \ - src/optional/ed25519.h \ - src/optional/ed25519.c \ - tests/utils.h \ - tests/utils.c \ - tests/test.c \ - tests/vectors.h \ +cp src/monocypher.c \ + src/monocypher.h \ + src/optional/monocypher-ed25519.h \ + src/optional/monocypher-ed25519.c \ + tests/utils.h \ + tests/utils.c \ + tests/test.c \ + tests/vectors.h \ tests/formal-analysis diff --git a/tests/speed/speed.c b/tests/speed/speed.c index ecf28a7..c466556 100644 --- a/tests/speed/speed.c +++ b/tests/speed/speed.c @@ -1,6 +1,6 @@ #include "speed.h" #include "monocypher.h" -#include "ed25519.h" +#include "monocypher-ed25519.h" #include "utils.h" static u64 chacha20(void) diff --git a/tests/test.c b/tests/test.c index dd353fc..3f28c23 100644 --- a/tests/test.c +++ b/tests/test.c @@ -2,7 +2,7 @@ #include #include #include "monocypher.h" -#include "ed25519.h" +#include "monocypher-ed25519.h" #include "utils.h" #include "vectors.h" -- 2.47.3