rbnacl-libsodium 1.0.15.1 → 1.0.16

data/vendor/libsodium/src/libsodium/sodium/core.c

@@ -1,4 +1,5 @@
 
+#include <assert.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
@@ -36,6 +37,7 @@
 #endif
 
 static volatile int initialized;
+static volatile int locked;
 
 int
 sodium_init(void)
@@ -98,6 +100,8 @@ sodium_crit_enter(void)
         return -1; /* LCOV_EXCL_LINE */
     }
     EnterCriticalSection(&_sodium_lock);
+    assert(locked == 0);
+    locked = 1;
 
     return 0;
 }
@@ -105,6 +109,13 @@ sodium_crit_enter(void)
 int
 sodium_crit_leave(void)
 {
+    if (locked == 0) {
+# ifdef EPERM
+        errno = EPERM;
+# endif
+        return -1;
+    }
+    locked = 0;
     LeaveCriticalSection(&_sodium_lock);
 
     return 0;
@@ -117,12 +128,28 @@ static pthread_mutex_t _sodium_lock = PTHREAD_MUTEX_INITIALIZER;
 int
 sodium_crit_enter(void)
 {
-    return pthread_mutex_lock(&_sodium_lock);
+    int ret;
+
+    if ((ret = pthread_mutex_lock(&_sodium_lock)) == 0) {
+        assert(locked == 0);
+        locked = 1;
+    }
+    return ret;
 }
 
 int
 sodium_crit_leave(void)
 {
+    int ret;
+
+    if (locked == 0) {
+# ifdef EPERM
+        errno = EPERM;
+# endif
+        return -1;
+    }
+    locked = 0;
+
     return pthread_mutex_unlock(&_sodium_lock);
 }
 
@@ -178,9 +205,10 @@ sodium_misuse(void)
 {
     void (*handler)(void);
 
+    (void) sodium_crit_leave();
     if (sodium_crit_enter() == 0) {
         handler = _misuse_handler;
-        if (sodium_crit_leave() == 0 && handler != NULL) {
+        if (handler != NULL) {
             handler();
         }
     }

data/vendor/libsodium/src/libsodium/sodium/runtime.c

@@ -19,6 +19,7 @@ typedef struct CPUFeatures_ {
     int has_avx512f;
     int has_pclmul;
     int has_aesni;
+    int has_rdrand;
 } CPUFeatures;
 
 static CPUFeatures _cpu_features;
@@ -34,6 +35,7 @@ static CPUFeatures _cpu_features;
 #define CPUID_ECX_XSAVE   0x04000000
 #define CPUID_ECX_OSXSAVE 0x08000000
 #define CPUID_ECX_AVX     0x10000000
+#define CPUID_ECX_RDRAND  0x40000000
 
 #define CPUID_EDX_SSE2    0x04000000
 
@@ -196,6 +198,12 @@ _sodium_runtime_intel_cpu_features(CPUFeatures * const cpu_features)
     cpu_features->has_aesni  = 0;
 #endif
 
+#ifdef HAVE_RDRAND
+    cpu_features->has_rdrand = ((cpu_info[2] & CPUID_ECX_RDRAND) != 0x0);
+#else
+    cpu_features->has_rdrand = 0;
+#endif
+
     return 0;
 }
 
@@ -270,3 +278,9 @@ sodium_runtime_has_aesni(void)
 {
     return _cpu_features.has_aesni;
 }
+
+int
+sodium_runtime_has_rdrand(void)
+{
+    return _cpu_features.has_rdrand;
+}

data/vendor/libsodium/src/libsodium/sodium/utils.c

@@ -21,6 +21,27 @@
 # include <unistd.h>
 #endif
 
+#ifndef HAVE_C_VARARRAYS
+# ifdef HAVE_ALLOCA_H
+#  include <alloca.h>
+# elif !defined(alloca)
+#  if defined(__GNUC__)
+#   define alloca __builtin_alloca
+#  elif defined _AIX
+#   define alloca __alloca
+#  elif defined _MSC_VER
+#   include <malloc.h>
+#   define alloca _alloca
+#  else
+#   include <stddef.h>
+#   ifdef  __cplusplus
+extern "C"
+#   endif
+void *alloca (size_t);
+#  endif
+# endif
+#endif
+
 #include "core.h"
 #include "randombytes.h"
 #include "utils.h"
@@ -66,6 +87,9 @@ static unsigned char canary[CANARY_SIZE];
 /* LCOV_EXCL_START */
 #ifdef HAVE_WEAK_SYMBOLS
 __attribute__((weak)) void
+_sodium_dummy_symbol_to_prevent_memzero_lto(void *const  pnt,
+                                            const size_t len);
+__attribute__((weak)) void
 _sodium_dummy_symbol_to_prevent_memzero_lto(void *const  pnt,
                                             const size_t len)
 {
@@ -89,6 +113,9 @@ sodium_memzero(void *const pnt, const size_t len)
 #elif HAVE_WEAK_SYMBOLS
     memset(pnt, 0, len);
     _sodium_dummy_symbol_to_prevent_memzero_lto(pnt, len);
+# ifdef HAVE_AMD64_ASM
+    __asm__ __volatile__ ("" : : "p"(pnt));
+# endif
 #else
     volatile unsigned char *volatile pnt_ =
         (volatile unsigned char *volatile) pnt;
@@ -100,8 +127,23 @@ sodium_memzero(void *const pnt, const size_t len)
 #endif
 }
 
+void
+sodium_stackzero(const size_t len)
+{
+#ifdef HAVE_C_VARARRAYS
+    unsigned char fodder[len];
+    sodium_memzero(fodder, len);
+#elif HAVE_ALLOCA
+    sodium_memzero(alloca(len), len);
+#endif
+}
+
 #ifdef HAVE_WEAK_SYMBOLS
 __attribute__((weak)) void
+_sodium_dummy_symbol_to_prevent_memcmp_lto(const unsigned char *b1,
+                                           const unsigned char *b2,
+                                           const size_t         len);
+__attribute__((weak)) void
 _sodium_dummy_symbol_to_prevent_memcmp_lto(const unsigned char *b1,
                                            const unsigned char *b2,
                                            const size_t         len)
@@ -138,6 +180,10 @@ sodium_memcmp(const void *const b1_, const void *const b2_, size_t len)
 
 #ifdef HAVE_WEAK_SYMBOLS
 __attribute__((weak)) void
+_sodium_dummy_symbol_to_prevent_compare_lto(const unsigned char *b1,
+                                            const unsigned char *b2,
+                                            const size_t         len);
+__attribute__((weak)) void
 _sodium_dummy_symbol_to_prevent_compare_lto(const unsigned char *b1,
                                             const unsigned char *b2,
                                             const size_t         len)

data/vendor/libsodium/test/Makefile.in

@@ -94,7 +94,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_catchable_abrt.m4 \
 	$(top_srcdir)/m4/ax_check_compile_flag.m4 \
 	$(top_srcdir)/m4/ax_check_define.m4 \
 	$(top_srcdir)/m4/ax_check_link_flag.m4 \
-	$(top_srcdir)/m4/ax_pthread.m4 \
+	$(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/ax_tls.m4 \
 	$(top_srcdir)/m4/ax_valgrind_check.m4 \
 	$(top_srcdir)/m4/ld-output-def.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
@@ -189,6 +189,7 @@ am__relativize = \
   done; \
   reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
@@ -209,6 +210,7 @@ CFLAGS_AVX2 = @CFLAGS_AVX2@
 CFLAGS_AVX512F = @CFLAGS_AVX512F@
 CFLAGS_MMX = @CFLAGS_MMX@
 CFLAGS_PCLMUL = @CFLAGS_PCLMUL@
+CFLAGS_RDRAND = @CFLAGS_RDRAND@
 CFLAGS_SSE2 = @CFLAGS_SSE2@
 CFLAGS_SSE3 = @CFLAGS_SSE3@
 CFLAGS_SSE41 = @CFLAGS_SSE41@

data/vendor/libsodium/test/default/Makefile.am

@@ -22,6 +22,7 @@ EXTRA_DIST = \
 	box_seed.exp \
 	chacha20.exp \
 	codecs.exp \
+	core_ed25519.exp \
 	core1.exp \
 	core2.exp \
 	core3.exp \
@@ -49,6 +50,7 @@ EXTRA_DIST = \
 	pwhash_scrypt_ll.exp \
 	randombytes.exp \
 	scalarmult.exp \
+	scalarmult_ed25519.exp \
 	scalarmult2.exp \
 	scalarmult5.exp \
 	scalarmult6.exp \
@@ -95,6 +97,7 @@ DISTCLEANFILES = \
 	box_seed.res \
 	chacha20.res \
 	codecs.res \
+	core_ed25519.res \
 	core1.res \
 	core2.res \
 	core3.res \
@@ -122,6 +125,7 @@ DISTCLEANFILES = \
 	pwhash_scrypt_ll.res \
 	randombytes.res \
 	scalarmult.res \
+	scalarmult_ed25519.res \
 	scalarmult2.res \
 	scalarmult5.res \
 	scalarmult6.res \
@@ -169,6 +173,7 @@ CLEANFILES = \
 	box_seed.final \
 	chacha20.final \
 	codecs.final \
+	core_ed25519.final \
 	core1.final \
 	core2.final \
 	core3.final \
@@ -196,6 +201,7 @@ CLEANFILES = \
 	pwhash_scrypt_ll.final \
 	randombytes.final \
 	scalarmult.final \
+	scalarmult_ed25519.final \
 	scalarmult2.final \
 	scalarmult5.final \
 	scalarmult6.final \
@@ -238,6 +244,7 @@ CLEANFILES = \
 	box_seed.nexe \
 	chacha20.nexe \
 	codecs.nexe \
+	core_ed25519.nexe \
 	core1.nexe \
 	core2.nexe \
 	core3.nexe \
@@ -265,6 +272,7 @@ CLEANFILES = \
 	pwhash_scrypt_ll.nexe \
 	randombytes.nexe \
 	scalarmult.nexe \
+	scalarmult_ed25519.nexe \
 	scalarmult2.nexe \
 	scalarmult5.nexe \
 	scalarmult6.nexe \
@@ -438,6 +446,9 @@ chacha20_LDADD            = $(TESTS_LDADD)
 codecs_SOURCE             = cmptest.h codecs.c
 codecs_LDADD              = $(TESTS_LDADD)
 
+core_ed25519_SOURCE       = cmptest.h core_ed25519.c
+core_ed25519_LDADD        = $(TESTS_LDADD)
+
 core1_SOURCE              = cmptest.h core1.c
 core1_LDADD               = $(TESTS_LDADD)
 
@@ -516,6 +527,9 @@ randombytes_LDADD         = $(TESTS_LDADD)
 scalarmult_SOURCE         = cmptest.h scalarmult.c
 scalarmult_LDADD          = $(TESTS_LDADD)
 
+scalarmult_ed25519_SOURCE = cmptest.h scalarmult_ed25519.c
+scalarmult_ed25519_LDADD  = $(TESTS_LDADD)
+
 scalarmult2_SOURCE        = cmptest.h scalarmult2.c
 scalarmult2_LDADD         = $(TESTS_LDADD)
 
@@ -593,8 +607,10 @@ xchacha20_LDADD           = $(TESTS_LDADD)
 
 if !MINIMAL
 TESTS_TARGETS += \
+	core_ed25519 \
 	pwhash_scrypt \
 	pwhash_scrypt_ll \
+	scalarmult_ed25519 \
 	siphashx24 \
 	xchacha20
 endif

data/vendor/libsodium/test/default/Makefile.in

@@ -94,8 +94,10 @@ host_triplet = @host@
 check_PROGRAMS = $(am__EXEEXT_3)
 TESTS = $(am__EXEEXT_3)
 @MINIMAL_FALSE@am__append_2 = \
+@MINIMAL_FALSE@	core_ed25519 \
 @MINIMAL_FALSE@	pwhash_scrypt \
 @MINIMAL_FALSE@	pwhash_scrypt_ll \
+@MINIMAL_FALSE@	scalarmult_ed25519 \
 @MINIMAL_FALSE@	siphashx24 \
 @MINIMAL_FALSE@	xchacha20
 
@@ -106,7 +108,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_catchable_abrt.m4 \
 	$(top_srcdir)/m4/ax_check_compile_flag.m4 \
 	$(top_srcdir)/m4/ax_check_define.m4 \
 	$(top_srcdir)/m4/ax_check_link_flag.m4 \
-	$(top_srcdir)/m4/ax_pthread.m4 \
+	$(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/ax_tls.m4 \
 	$(top_srcdir)/m4/ax_valgrind_check.m4 \
 	$(top_srcdir)/m4/ld-output-def.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
@@ -121,8 +123,10 @@ CONFIG_CLEAN_VPATH_FILES =
 @EMSCRIPTEN_FALSE@@NATIVECLIENT_FALSE@am__EXEEXT_1 =  \
 @EMSCRIPTEN_FALSE@@NATIVECLIENT_FALSE@	sodium_utils2$(EXEEXT) \
 @EMSCRIPTEN_FALSE@@NATIVECLIENT_FALSE@	sodium_utils3$(EXEEXT)
-@MINIMAL_FALSE@am__EXEEXT_2 = pwhash_scrypt$(EXEEXT) \
-@MINIMAL_FALSE@	pwhash_scrypt_ll$(EXEEXT) siphashx24$(EXEEXT) \
+@MINIMAL_FALSE@am__EXEEXT_2 = core_ed25519$(EXEEXT) \
+@MINIMAL_FALSE@	pwhash_scrypt$(EXEEXT) \
+@MINIMAL_FALSE@	pwhash_scrypt_ll$(EXEEXT) \
+@MINIMAL_FALSE@	scalarmult_ed25519$(EXEEXT) siphashx24$(EXEEXT) \
 @MINIMAL_FALSE@	xchacha20$(EXEEXT)
 am__EXEEXT_3 = aead_aes256gcm$(EXEEXT) aead_chacha20poly1305$(EXEEXT) \
 	aead_xchacha20poly1305$(EXEEXT) auth$(EXEEXT) auth2$(EXEEXT) \
@@ -226,6 +230,9 @@ core5_DEPENDENCIES = $(TESTS_LDADD)
 core6_SOURCES = core6.c
 core6_OBJECTS = core6.$(OBJEXT)
 core6_DEPENDENCIES = $(TESTS_LDADD)
+core_ed25519_SOURCES = core_ed25519.c
+core_ed25519_OBJECTS = core_ed25519.$(OBJEXT)
+core_ed25519_DEPENDENCIES = $(TESTS_LDADD)
 ed25519_convert_SOURCES = ed25519_convert.c
 ed25519_convert_OBJECTS = ed25519_convert.$(OBJEXT)
 ed25519_convert_DEPENDENCIES = $(TESTS_LDADD)
@@ -298,6 +305,9 @@ scalarmult6_DEPENDENCIES = $(TESTS_LDADD)
 scalarmult7_SOURCES = scalarmult7.c
 scalarmult7_OBJECTS = scalarmult7.$(OBJEXT)
 scalarmult7_DEPENDENCIES = $(TESTS_LDADD)
+scalarmult_ed25519_SOURCES = scalarmult_ed25519.c
+scalarmult_ed25519_OBJECTS = scalarmult_ed25519.$(OBJEXT)
+scalarmult_ed25519_DEPENDENCIES = $(TESTS_LDADD)
 secretbox_SOURCES = secretbox.c
 secretbox_OBJECTS = secretbox.$(OBJEXT)
 secretbox_DEPENDENCIES = $(TESTS_LDADD)
@@ -399,34 +409,34 @@ SOURCES = aead_aes256gcm.c aead_chacha20poly1305.c \
 	aead_xchacha20poly1305.c auth.c auth2.c auth3.c auth5.c \
 	auth6.c auth7.c box.c box2.c box7.c box8.c box_easy.c \
 	box_easy2.c box_seal.c box_seed.c chacha20.c codecs.c core1.c \
-	core2.c core3.c core4.c core5.c core6.c ed25519_convert.c \
-	generichash.c generichash2.c generichash3.c hash.c hash3.c \
-	kdf.c keygen.c kx.c metamorphic.c misuse.c onetimeauth.c \
-	onetimeauth2.c onetimeauth7.c pwhash_argon2i.c \
+	core2.c core3.c core4.c core5.c core6.c core_ed25519.c \
+	ed25519_convert.c generichash.c generichash2.c generichash3.c \
+	hash.c hash3.c kdf.c keygen.c kx.c metamorphic.c misuse.c \
+	onetimeauth.c onetimeauth2.c onetimeauth7.c pwhash_argon2i.c \
 	pwhash_argon2id.c pwhash_scrypt.c pwhash_scrypt_ll.c \
 	randombytes.c scalarmult.c scalarmult2.c scalarmult5.c \
-	scalarmult6.c scalarmult7.c secretbox.c secretbox2.c \
-	secretbox7.c secretbox8.c secretbox_easy.c secretbox_easy2.c \
-	secretstream.c shorthash.c sign.c siphashx24.c sodium_core.c \
-	sodium_utils.c sodium_utils2.c sodium_utils3.c \
-	sodium_version.c stream.c stream2.c stream3.c stream4.c \
-	verify1.c xchacha20.c
+	scalarmult6.c scalarmult7.c scalarmult_ed25519.c secretbox.c \
+	secretbox2.c secretbox7.c secretbox8.c secretbox_easy.c \
+	secretbox_easy2.c secretstream.c shorthash.c sign.c \
+	siphashx24.c sodium_core.c sodium_utils.c sodium_utils2.c \
+	sodium_utils3.c sodium_version.c stream.c stream2.c stream3.c \
+	stream4.c verify1.c xchacha20.c
 DIST_SOURCES = aead_aes256gcm.c aead_chacha20poly1305.c \
 	aead_xchacha20poly1305.c auth.c auth2.c auth3.c auth5.c \
 	auth6.c auth7.c box.c box2.c box7.c box8.c box_easy.c \
 	box_easy2.c box_seal.c box_seed.c chacha20.c codecs.c core1.c \
-	core2.c core3.c core4.c core5.c core6.c ed25519_convert.c \
-	generichash.c generichash2.c generichash3.c hash.c hash3.c \
-	kdf.c keygen.c kx.c metamorphic.c misuse.c onetimeauth.c \
-	onetimeauth2.c onetimeauth7.c pwhash_argon2i.c \
+	core2.c core3.c core4.c core5.c core6.c core_ed25519.c \
+	ed25519_convert.c generichash.c generichash2.c generichash3.c \
+	hash.c hash3.c kdf.c keygen.c kx.c metamorphic.c misuse.c \
+	onetimeauth.c onetimeauth2.c onetimeauth7.c pwhash_argon2i.c \
 	pwhash_argon2id.c pwhash_scrypt.c pwhash_scrypt_ll.c \
 	randombytes.c scalarmult.c scalarmult2.c scalarmult5.c \
-	scalarmult6.c scalarmult7.c secretbox.c secretbox2.c \
-	secretbox7.c secretbox8.c secretbox_easy.c secretbox_easy2.c \
-	secretstream.c shorthash.c sign.c siphashx24.c sodium_core.c \
-	sodium_utils.c sodium_utils2.c sodium_utils3.c \
-	sodium_version.c stream.c stream2.c stream3.c stream4.c \
-	verify1.c xchacha20.c
+	scalarmult6.c scalarmult7.c scalarmult_ed25519.c secretbox.c \
+	secretbox2.c secretbox7.c secretbox8.c secretbox_easy.c \
+	secretbox_easy2.c secretstream.c shorthash.c sign.c \
+	siphashx24.c sodium_core.c sodium_utils.c sodium_utils2.c \
+	sodium_utils3.c sodium_version.c stream.c stream2.c stream3.c \
+	stream4.c verify1.c xchacha20.c
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -660,6 +670,7 @@ am__DIST_COMMON = $(srcdir)/Makefile.in \
 	$(top_srcdir)/build-aux/test-driver
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
@@ -680,6 +691,7 @@ CFLAGS_AVX2 = @CFLAGS_AVX2@
 CFLAGS_AVX512F = @CFLAGS_AVX512F@
 CFLAGS_MMX = @CFLAGS_MMX@
 CFLAGS_PCLMUL = @CFLAGS_PCLMUL@
+CFLAGS_RDRAND = @CFLAGS_RDRAND@
 CFLAGS_SSE2 = @CFLAGS_SSE2@
 CFLAGS_SSE3 = @CFLAGS_SSE3@
 CFLAGS_SSE41 = @CFLAGS_SSE41@
@@ -839,6 +851,7 @@ EXTRA_DIST = \
 	box_seed.exp \
 	chacha20.exp \
 	codecs.exp \
+	core_ed25519.exp \
 	core1.exp \
 	core2.exp \
 	core3.exp \
@@ -866,6 +879,7 @@ EXTRA_DIST = \
 	pwhash_scrypt_ll.exp \
 	randombytes.exp \
 	scalarmult.exp \
+	scalarmult_ed25519.exp \
 	scalarmult2.exp \
 	scalarmult5.exp \
 	scalarmult6.exp \
@@ -912,6 +926,7 @@ DISTCLEANFILES = \
 	box_seed.res \
 	chacha20.res \
 	codecs.res \
+	core_ed25519.res \
 	core1.res \
 	core2.res \
 	core3.res \
@@ -939,6 +954,7 @@ DISTCLEANFILES = \
 	pwhash_scrypt_ll.res \
 	randombytes.res \
 	scalarmult.res \
+	scalarmult_ed25519.res \
 	scalarmult2.res \
 	scalarmult5.res \
 	scalarmult6.res \
@@ -985,6 +1001,7 @@ DISTCLEANFILES = \
 @NATIVECLIENT_TRUE@	box_seed.final \
 @NATIVECLIENT_TRUE@	chacha20.final \
 @NATIVECLIENT_TRUE@	codecs.final \
+@NATIVECLIENT_TRUE@	core_ed25519.final \
 @NATIVECLIENT_TRUE@	core1.final \
 @NATIVECLIENT_TRUE@	core2.final \
 @NATIVECLIENT_TRUE@	core3.final \
@@ -1012,6 +1029,7 @@ DISTCLEANFILES = \
 @NATIVECLIENT_TRUE@	pwhash_scrypt_ll.final \
 @NATIVECLIENT_TRUE@	randombytes.final \
 @NATIVECLIENT_TRUE@	scalarmult.final \
+@NATIVECLIENT_TRUE@	scalarmult_ed25519.final \
 @NATIVECLIENT_TRUE@	scalarmult2.final \
 @NATIVECLIENT_TRUE@	scalarmult5.final \
 @NATIVECLIENT_TRUE@	scalarmult6.final \
@@ -1054,6 +1072,7 @@ DISTCLEANFILES = \
 @NATIVECLIENT_TRUE@	box_seed.nexe \
 @NATIVECLIENT_TRUE@	chacha20.nexe \
 @NATIVECLIENT_TRUE@	codecs.nexe \
+@NATIVECLIENT_TRUE@	core_ed25519.nexe \
 @NATIVECLIENT_TRUE@	core1.nexe \
 @NATIVECLIENT_TRUE@	core2.nexe \
 @NATIVECLIENT_TRUE@	core3.nexe \
@@ -1081,6 +1100,7 @@ DISTCLEANFILES = \
 @NATIVECLIENT_TRUE@	pwhash_scrypt_ll.nexe \
 @NATIVECLIENT_TRUE@	randombytes.nexe \
 @NATIVECLIENT_TRUE@	scalarmult.nexe \
+@NATIVECLIENT_TRUE@	scalarmult_ed25519.nexe \
 @NATIVECLIENT_TRUE@	scalarmult2.nexe \
 @NATIVECLIENT_TRUE@	scalarmult5.nexe \
 @NATIVECLIENT_TRUE@	scalarmult6.nexe \
@@ -1167,6 +1187,8 @@ chacha20_SOURCE = cmptest.h chacha20.c
 chacha20_LDADD = $(TESTS_LDADD)
 codecs_SOURCE = cmptest.h codecs.c
 codecs_LDADD = $(TESTS_LDADD)
+core_ed25519_SOURCE = cmptest.h core_ed25519.c
+core_ed25519_LDADD = $(TESTS_LDADD)
 core1_SOURCE = cmptest.h core1.c
 core1_LDADD = $(TESTS_LDADD)
 core2_SOURCE = cmptest.h core2.c
@@ -1219,6 +1241,8 @@ randombytes_SOURCE = cmptest.h randombytes.c
 randombytes_LDADD = $(TESTS_LDADD)
 scalarmult_SOURCE = cmptest.h scalarmult.c
 scalarmult_LDADD = $(TESTS_LDADD)
+scalarmult_ed25519_SOURCE = cmptest.h scalarmult_ed25519.c
+scalarmult_ed25519_LDADD = $(TESTS_LDADD)
 scalarmult2_SOURCE = cmptest.h scalarmult2.c
 scalarmult2_LDADD = $(TESTS_LDADD)
 scalarmult5_SOURCE = cmptest.h scalarmult5.c
@@ -1413,6 +1437,10 @@ core6$(EXEEXT): $(core6_OBJECTS) $(core6_DEPENDENCIES) $(EXTRA_core6_DEPENDENCIE
 	@rm -f core6$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(core6_OBJECTS) $(core6_LDADD) $(LIBS)
 
+core_ed25519$(EXEEXT): $(core_ed25519_OBJECTS) $(core_ed25519_DEPENDENCIES) $(EXTRA_core_ed25519_DEPENDENCIES) 
+	@rm -f core_ed25519$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(core_ed25519_OBJECTS) $(core_ed25519_LDADD) $(LIBS)
+
 ed25519_convert$(EXEEXT): $(ed25519_convert_OBJECTS) $(ed25519_convert_DEPENDENCIES) $(EXTRA_ed25519_convert_DEPENDENCIES) 
 	@rm -f ed25519_convert$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(ed25519_convert_OBJECTS) $(ed25519_convert_LDADD) $(LIBS)
@@ -1509,6 +1537,10 @@ scalarmult7$(EXEEXT): $(scalarmult7_OBJECTS) $(scalarmult7_DEPENDENCIES) $(EXTRA
 	@rm -f scalarmult7$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(scalarmult7_OBJECTS) $(scalarmult7_LDADD) $(LIBS)
 
+scalarmult_ed25519$(EXEEXT): $(scalarmult_ed25519_OBJECTS) $(scalarmult_ed25519_DEPENDENCIES) $(EXTRA_scalarmult_ed25519_DEPENDENCIES) 
+	@rm -f scalarmult_ed25519$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(scalarmult_ed25519_OBJECTS) $(scalarmult_ed25519_LDADD) $(LIBS)
+
 secretbox$(EXEEXT): $(secretbox_OBJECTS) $(secretbox_DEPENDENCIES) $(EXTRA_secretbox_DEPENDENCIES) 
 	@rm -f secretbox$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(secretbox_OBJECTS) $(secretbox_LDADD) $(LIBS)
@@ -1624,6 +1656,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/core4.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/core5.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/core6.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/core_ed25519.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ed25519_convert.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/generichash.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/generichash2.Po@am__quote@
@@ -1648,6 +1681,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scalarmult5.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scalarmult6.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scalarmult7.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scalarmult_ed25519.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/secretbox.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/secretbox2.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/secretbox7.Po@am__quote@
@@ -2355,6 +2389,13 @@ sodium_utils3.log: sodium_utils3$(EXEEXT)
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
+core_ed25519.log: core_ed25519$(EXEEXT)
+	@p='core_ed25519$(EXEEXT)'; \
+	b='core_ed25519'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 pwhash_scrypt.log: pwhash_scrypt$(EXEEXT)
 	@p='pwhash_scrypt$(EXEEXT)'; \
 	b='pwhash_scrypt'; \
@@ -2369,6 +2410,13 @@ pwhash_scrypt_ll.log: pwhash_scrypt_ll$(EXEEXT)
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
+scalarmult_ed25519.log: scalarmult_ed25519$(EXEEXT)
+	@p='scalarmult_ed25519$(EXEEXT)'; \
+	b='scalarmult_ed25519'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 siphashx24.log: siphashx24$(EXEEXT)
 	@p='siphashx24$(EXEEXT)'; \
 	b='siphashx24'; \