Remove Monocypher custom hash from ed25519-donna

Only use libsodium's here.  It makes more sense when we generate the
test vectors, since Monocypher is ostensibly not compiled yet.

diff --git a/makefile b/makefile
index d0799285a565e1a9921266559a6344637b2fe032..54ad35261c41ad6baf3e0238300ed979d1abfc0a 100644 (file)
--- a/makefile
+++ b/makefile
@@ -211,7 +211,6 @@ lib/speed-ed25519.o: tests/externals/ed25519-donna/ed25519.c \
            $(wildcard tests/externals/ed25519-donna/*.h)
        $(CC) $(CFLAGS) -c $< -o$@            \
             -I src                            \
-            -DUSE_MONOCYPHER                  \
             -DED25519_CUSTOMHASH              \
             -DED25519_TEST                    \
             -DED25519_NO_INLINE_ASM           \
@@ -231,6 +230,10 @@ speed-sodium.out: lib/speed-sodium.o lib/utils.o
        $(CC) $(CFLAGS) -o $@ $^            \
             `pkg-config --cflags libsodium` \
             `pkg-config --libs   libsodium`
+speed-donna.out: lib/speed-donna.o lib/speed-ed25519.o lib/utils.o
+       $(CC) $(CFLAGS) -o $@ $^ \
+            `pkg-config --cflags libsodium` \
+            `pkg-config --libs   libsodium`
 speed-hydrogen.out: lib/speed-hydrogen.o lib/utils.o
        $(CC) $(CFLAGS) -o $@ $^              \
             `pkg-config --cflags libhydrogen` \
@@ -239,11 +242,9 @@ lib/tweetnacl.o: tests/externals/tweetnacl/tweetnacl.c \
                  tests/externals/tweetnacl/tweetnacl.h
        $(CC) $(CFLAGS) -c -o $@ $<
 speed-tweetnacl.out: lib/speed-tweetnacl.o lib/tweetnacl.o lib/utils.o
+       $(CC) $(CFLAGS) -o $@ $^
 speed-c25519.out   : lib/speed-c25519.o $(C25519_OBJECTS) lib/utils.o
-speed-donna.out    : lib/speed-donna.o lib/speed-ed25519.o lib/utils.o lib/monocypher.o
-speed-tweetnacl.out speed-c25519.out speed-donna.out:
        $(CC) $(CFLAGS) -o $@ $^
-
 tests/vectors.h:
        @echo ""
        @echo "======================================================"

diff --git a/tests/externals/ed25519-donna/ed25519-hash-custom.h b/tests/externals/ed25519-donna/ed25519-hash-custom.h
index 0bf61d28f1c30cde2f0a0003feda94beb009d3d4..94a00769d1e315ef2c647faaac5c466bd80d796e 100644 (file)
--- a/tests/externals/ed25519-donna/ed25519-hash-custom.h
+++ b/tests/externals/ed25519-donna/ed25519-hash-custom.h
@@ -1,31 +1,3 @@
-#ifdef USE_MONOCYPHER
-
-#include <monocypher.h>
-
-typedef crypto_blake2b_ctx ed25519_hash_context;
-
-void ed25519_hash_init(ed25519_hash_context *ctx)
-{
-    crypto_blake2b_init(ctx);
-}
-
-void ed25519_hash_update(ed25519_hash_context *ctx, const uint8_t *in, size_t inlen)
-{
-    crypto_blake2b_update(ctx, in, inlen);
-}
-
-void ed25519_hash_final(ed25519_hash_context *ctx, uint8_t *hash)
-{
-    crypto_blake2b_final(ctx, hash);
-}
-
-void ed25519_hash(uint8_t *hash, const uint8_t *in, size_t inlen)
-{
-    crypto_blake2b(hash, in, inlen);
-}
-
-#else
-
 #include <sodium.h>
 
 typedef crypto_generichash_state ed25519_hash_context;
@@ -49,5 +21,3 @@ void ed25519_hash(uint8_t *hash, const uint8_t *in, size_t inlen)
 {
     crypto_generichash(hash, 64, in, inlen, 0, 0);
 }
-
-#endif