diff --git a/builds/msvc/vs2010/libsodium/libsodium.vcxproj b/builds/msvc/vs2010/libsodium/libsodium.vcxproj
index e3b7ec1f..10112203 100644
--- a/builds/msvc/vs2010/libsodium/libsodium.vcxproj
+++ b/builds/msvc/vs2010/libsodium/libsodium.vcxproj
@@ -180,7 +180,7 @@
-
+
@@ -190,7 +190,7 @@
-
+
@@ -251,12 +251,12 @@
-
+
+
+
-
-
@@ -302,14 +302,14 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters
index 877dff32..d3b56126 100644
--- a/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters
+++ b/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters
@@ -333,8 +333,8 @@
crypto_core\hsalsa20\ref2
-
- crypto_core\curve25519\ref10
+
+ crypto_core\ed25519\ref10
@@ -359,7 +359,7 @@
crypto_generichash\blake2b\ref
-
+
crypto_sign\ed25519\ref10
@@ -542,7 +542,13 @@
include\sodium
-
+
+ include\sodium\private
+
+
+ include\sodium\private
+
+
include\sodium\private
@@ -551,15 +557,9 @@
include\sodium\private
-
- include\sodium\private
-
include\sodium\private
-
- include\sodium\private
-
include\sodium\private
@@ -695,29 +695,29 @@
crypto_stream\salsa20\xmm6
-
- crypto_core\curve25519\ref10\fe_25_5
+
+ crypto_core\ed25519\ref10\fe_25_5
-
- crypto_core\curve25519\ref10\fe_25_5
+
+ crypto_core\ed25519\ref10\fe_25_5
-
- crypto_core\curve25519\ref10\fe_25_5
+
+ crypto_core\ed25519\ref10\fe_25_5
-
- crypto_core\curve25519\ref10\fe_25_5
+
+ crypto_core\ed25519\ref10\fe_25_5
-
- crypto_core\curve25519\ref10\fe_51
+
+ crypto_core\ed25519\ref10\fe_51
-
- crypto_core\curve25519\ref10\fe_51
+
+ crypto_core\ed25519\ref10\fe_51
-
- crypto_core\curve25519\ref10\fe_51
+
+ crypto_core\ed25519\ref10\fe_51
-
- crypto_core\curve25519\ref10\fe_51
+
+ crypto_core\ed25519\ref10\fe_51
@@ -766,17 +766,17 @@
{73194d5d-588a-342f-bee6-f28b4486f20b}
-
- {028a752d-1880-3283-9acb-79a5d3162d12}
+
+ {7c5e6f81-e4ce-3018-a776-a1f125072d73}
-
- {ff5842af-bbd1-3a87-9939-c36522a38fb8}
+
+ {76990c08-d692-367f-b286-c728a8cad6bf}
-
- {e1a65ae7-b847-3441-bb23-e3eebbd63e9c}
+
+ {bf04f786-7862-3bde-aeba-ed82ee59ca22}
-
- {b346bbaa-bfda-3fab-a0fe-ea02d7e61193}
+
+ {98b6126a-3725-3707-a4cc-ff3af657cba0}
{8b704d11-af1f-30c0-9981-479da6d88dc3}
diff --git a/builds/msvc/vs2012/libsodium/libsodium.vcxproj b/builds/msvc/vs2012/libsodium/libsodium.vcxproj
index 868ff0c4..821212c2 100644
--- a/builds/msvc/vs2012/libsodium/libsodium.vcxproj
+++ b/builds/msvc/vs2012/libsodium/libsodium.vcxproj
@@ -180,7 +180,7 @@
-
+
@@ -190,7 +190,7 @@
-
+
@@ -251,12 +251,12 @@
-
+
+
+
-
-
@@ -302,14 +302,14 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters
index 877dff32..d3b56126 100644
--- a/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters
+++ b/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters
@@ -333,8 +333,8 @@
crypto_core\hsalsa20\ref2
-
- crypto_core\curve25519\ref10
+
+ crypto_core\ed25519\ref10
@@ -359,7 +359,7 @@
crypto_generichash\blake2b\ref
-
+
crypto_sign\ed25519\ref10
@@ -542,7 +542,13 @@
include\sodium
-
+
+ include\sodium\private
+
+
+ include\sodium\private
+
+
include\sodium\private
@@ -551,15 +557,9 @@
include\sodium\private
-
- include\sodium\private
-
include\sodium\private
-
- include\sodium\private
-
include\sodium\private
@@ -695,29 +695,29 @@
crypto_stream\salsa20\xmm6
-
- crypto_core\curve25519\ref10\fe_25_5
+
+ crypto_core\ed25519\ref10\fe_25_5
-
- crypto_core\curve25519\ref10\fe_25_5
+
+ crypto_core\ed25519\ref10\fe_25_5
-
- crypto_core\curve25519\ref10\fe_25_5
+
+ crypto_core\ed25519\ref10\fe_25_5
-
- crypto_core\curve25519\ref10\fe_25_5
+
+ crypto_core\ed25519\ref10\fe_25_5
-
- crypto_core\curve25519\ref10\fe_51
+
+ crypto_core\ed25519\ref10\fe_51
-
- crypto_core\curve25519\ref10\fe_51
+
+ crypto_core\ed25519\ref10\fe_51
-
- crypto_core\curve25519\ref10\fe_51
+
+ crypto_core\ed25519\ref10\fe_51
-
- crypto_core\curve25519\ref10\fe_51
+
+ crypto_core\ed25519\ref10\fe_51
@@ -766,17 +766,17 @@
{73194d5d-588a-342f-bee6-f28b4486f20b}
-
- {028a752d-1880-3283-9acb-79a5d3162d12}
+
+ {7c5e6f81-e4ce-3018-a776-a1f125072d73}
-
- {ff5842af-bbd1-3a87-9939-c36522a38fb8}
+
+ {76990c08-d692-367f-b286-c728a8cad6bf}
-
- {e1a65ae7-b847-3441-bb23-e3eebbd63e9c}
+
+ {bf04f786-7862-3bde-aeba-ed82ee59ca22}
-
- {b346bbaa-bfda-3fab-a0fe-ea02d7e61193}
+
+ {98b6126a-3725-3707-a4cc-ff3af657cba0}
{8b704d11-af1f-30c0-9981-479da6d88dc3}
diff --git a/builds/msvc/vs2013/libsodium/libsodium.vcxproj b/builds/msvc/vs2013/libsodium/libsodium.vcxproj
index dd16a6c8..d24f224d 100644
--- a/builds/msvc/vs2013/libsodium/libsodium.vcxproj
+++ b/builds/msvc/vs2013/libsodium/libsodium.vcxproj
@@ -180,7 +180,7 @@
-
+
@@ -190,7 +190,7 @@
-
+
@@ -251,12 +251,12 @@
-
+
+
+
-
-
@@ -302,14 +302,14 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters
index 877dff32..d3b56126 100644
--- a/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters
+++ b/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters
@@ -333,8 +333,8 @@
crypto_core\hsalsa20\ref2
-
- crypto_core\curve25519\ref10
+
+ crypto_core\ed25519\ref10
@@ -359,7 +359,7 @@
crypto_generichash\blake2b\ref
-
+
crypto_sign\ed25519\ref10
@@ -542,7 +542,13 @@
include\sodium
-
+
+ include\sodium\private
+
+
+ include\sodium\private
+
+
include\sodium\private
@@ -551,15 +557,9 @@
include\sodium\private
-
- include\sodium\private
-
include\sodium\private
-
- include\sodium\private
-
include\sodium\private
@@ -695,29 +695,29 @@
crypto_stream\salsa20\xmm6
-
- crypto_core\curve25519\ref10\fe_25_5
+
+ crypto_core\ed25519\ref10\fe_25_5
-
- crypto_core\curve25519\ref10\fe_25_5
+
+ crypto_core\ed25519\ref10\fe_25_5
-
- crypto_core\curve25519\ref10\fe_25_5
+
+ crypto_core\ed25519\ref10\fe_25_5
-
- crypto_core\curve25519\ref10\fe_25_5
+
+ crypto_core\ed25519\ref10\fe_25_5
-
- crypto_core\curve25519\ref10\fe_51
+
+ crypto_core\ed25519\ref10\fe_51
-
- crypto_core\curve25519\ref10\fe_51
+
+ crypto_core\ed25519\ref10\fe_51
-
- crypto_core\curve25519\ref10\fe_51
+
+ crypto_core\ed25519\ref10\fe_51
-
- crypto_core\curve25519\ref10\fe_51
+
+ crypto_core\ed25519\ref10\fe_51
@@ -766,17 +766,17 @@
{73194d5d-588a-342f-bee6-f28b4486f20b}
-
- {028a752d-1880-3283-9acb-79a5d3162d12}
+
+ {7c5e6f81-e4ce-3018-a776-a1f125072d73}
-
- {ff5842af-bbd1-3a87-9939-c36522a38fb8}
+
+ {76990c08-d692-367f-b286-c728a8cad6bf}
-
- {e1a65ae7-b847-3441-bb23-e3eebbd63e9c}
+
+ {bf04f786-7862-3bde-aeba-ed82ee59ca22}
-
- {b346bbaa-bfda-3fab-a0fe-ea02d7e61193}
+
+ {98b6126a-3725-3707-a4cc-ff3af657cba0}
{8b704d11-af1f-30c0-9981-479da6d88dc3}
diff --git a/builds/msvc/vs2015/libsodium/libsodium.vcxproj b/builds/msvc/vs2015/libsodium/libsodium.vcxproj
index f9239631..51f8c51c 100644
--- a/builds/msvc/vs2015/libsodium/libsodium.vcxproj
+++ b/builds/msvc/vs2015/libsodium/libsodium.vcxproj
@@ -180,7 +180,7 @@
-
+
@@ -190,7 +190,7 @@
-
+
@@ -251,12 +251,12 @@
-
+
+
+
-
-
@@ -302,14 +302,14 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/builds/msvc/vs2015/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2015/libsodium/libsodium.vcxproj.filters
index 877dff32..d3b56126 100644
--- a/builds/msvc/vs2015/libsodium/libsodium.vcxproj.filters
+++ b/builds/msvc/vs2015/libsodium/libsodium.vcxproj.filters
@@ -333,8 +333,8 @@
crypto_core\hsalsa20\ref2
-
- crypto_core\curve25519\ref10
+
+ crypto_core\ed25519\ref10
@@ -359,7 +359,7 @@
crypto_generichash\blake2b\ref
-
+
crypto_sign\ed25519\ref10
@@ -542,7 +542,13 @@
include\sodium
-
+
+ include\sodium\private
+
+
+ include\sodium\private
+
+
include\sodium\private
@@ -551,15 +557,9 @@
include\sodium\private
-
- include\sodium\private
-
include\sodium\private
-
- include\sodium\private
-
include\sodium\private
@@ -695,29 +695,29 @@
crypto_stream\salsa20\xmm6
-
- crypto_core\curve25519\ref10\fe_25_5
+
+ crypto_core\ed25519\ref10\fe_25_5
-
- crypto_core\curve25519\ref10\fe_25_5
+
+ crypto_core\ed25519\ref10\fe_25_5
-
- crypto_core\curve25519\ref10\fe_25_5
+
+ crypto_core\ed25519\ref10\fe_25_5
-
- crypto_core\curve25519\ref10\fe_25_5
+
+ crypto_core\ed25519\ref10\fe_25_5
-
- crypto_core\curve25519\ref10\fe_51
+
+ crypto_core\ed25519\ref10\fe_51
-
- crypto_core\curve25519\ref10\fe_51
+
+ crypto_core\ed25519\ref10\fe_51
-
- crypto_core\curve25519\ref10\fe_51
+
+ crypto_core\ed25519\ref10\fe_51
-
- crypto_core\curve25519\ref10\fe_51
+
+ crypto_core\ed25519\ref10\fe_51
@@ -766,17 +766,17 @@
{73194d5d-588a-342f-bee6-f28b4486f20b}
-
- {028a752d-1880-3283-9acb-79a5d3162d12}
+
+ {7c5e6f81-e4ce-3018-a776-a1f125072d73}
-
- {ff5842af-bbd1-3a87-9939-c36522a38fb8}
+
+ {76990c08-d692-367f-b286-c728a8cad6bf}
-
- {e1a65ae7-b847-3441-bb23-e3eebbd63e9c}
+
+ {bf04f786-7862-3bde-aeba-ed82ee59ca22}
-
- {b346bbaa-bfda-3fab-a0fe-ea02d7e61193}
+
+ {98b6126a-3725-3707-a4cc-ff3af657cba0}
{8b704d11-af1f-30c0-9981-479da6d88dc3}
diff --git a/builds/msvc/vs2017/libsodium/libsodium.vcxproj b/builds/msvc/vs2017/libsodium/libsodium.vcxproj
index c36c57ea..815c1137 100644
--- a/builds/msvc/vs2017/libsodium/libsodium.vcxproj
+++ b/builds/msvc/vs2017/libsodium/libsodium.vcxproj
@@ -180,7 +180,7 @@
-
+
@@ -190,7 +190,7 @@
-
+
@@ -251,12 +251,12 @@
-
+
+
+
-
-
@@ -302,14 +302,14 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/builds/msvc/vs2017/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2017/libsodium/libsodium.vcxproj.filters
index 877dff32..d3b56126 100644
--- a/builds/msvc/vs2017/libsodium/libsodium.vcxproj.filters
+++ b/builds/msvc/vs2017/libsodium/libsodium.vcxproj.filters
@@ -333,8 +333,8 @@
crypto_core\hsalsa20\ref2
-
- crypto_core\curve25519\ref10
+
+ crypto_core\ed25519\ref10
@@ -359,7 +359,7 @@
crypto_generichash\blake2b\ref
-
+
crypto_sign\ed25519\ref10
@@ -542,7 +542,13 @@
include\sodium
-
+
+ include\sodium\private
+
+
+ include\sodium\private
+
+
include\sodium\private
@@ -551,15 +557,9 @@
include\sodium\private
-
- include\sodium\private
-
include\sodium\private
-
- include\sodium\private
-
include\sodium\private
@@ -695,29 +695,29 @@
crypto_stream\salsa20\xmm6
-
- crypto_core\curve25519\ref10\fe_25_5
+
+ crypto_core\ed25519\ref10\fe_25_5
-
- crypto_core\curve25519\ref10\fe_25_5
+
+ crypto_core\ed25519\ref10\fe_25_5
-
- crypto_core\curve25519\ref10\fe_25_5
+
+ crypto_core\ed25519\ref10\fe_25_5
-
- crypto_core\curve25519\ref10\fe_25_5
+
+ crypto_core\ed25519\ref10\fe_25_5
-
- crypto_core\curve25519\ref10\fe_51
+
+ crypto_core\ed25519\ref10\fe_51
-
- crypto_core\curve25519\ref10\fe_51
+
+ crypto_core\ed25519\ref10\fe_51
-
- crypto_core\curve25519\ref10\fe_51
+
+ crypto_core\ed25519\ref10\fe_51
-
- crypto_core\curve25519\ref10\fe_51
+
+ crypto_core\ed25519\ref10\fe_51
@@ -766,17 +766,17 @@
{73194d5d-588a-342f-bee6-f28b4486f20b}
-
- {028a752d-1880-3283-9acb-79a5d3162d12}
+
+ {7c5e6f81-e4ce-3018-a776-a1f125072d73}
-
- {ff5842af-bbd1-3a87-9939-c36522a38fb8}
+
+ {76990c08-d692-367f-b286-c728a8cad6bf}
-
- {e1a65ae7-b847-3441-bb23-e3eebbd63e9c}
+
+ {bf04f786-7862-3bde-aeba-ed82ee59ca22}
-
- {b346bbaa-bfda-3fab-a0fe-ea02d7e61193}
+
+ {98b6126a-3725-3707-a4cc-ff3af657cba0}
{8b704d11-af1f-30c0-9981-479da6d88dc3}
diff --git a/libsodium.vcxproj b/libsodium.vcxproj
index 3d4a6f91..b0dd3431 100644
--- a/libsodium.vcxproj
+++ b/libsodium.vcxproj
@@ -418,7 +418,7 @@
-
+
@@ -428,7 +428,7 @@
-
+
@@ -489,12 +489,12 @@
-
+
+
+
-
-
@@ -540,14 +540,14 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/libsodium.vcxproj.filters b/libsodium.vcxproj.filters
index f3e4a239..627197f7 100644
--- a/libsodium.vcxproj.filters
+++ b/libsodium.vcxproj.filters
@@ -324,7 +324,7 @@
Source Files
-
+
Source Files
@@ -350,7 +350,7 @@
Header Files
-
+
Header Files
@@ -533,7 +533,13 @@
Header Files
-
+
+ Header Files
+
+
+ Header Files
+
+
Header Files
@@ -542,15 +548,9 @@
Header Files
-
- Header Files
-
Header Files
-
- Header Files
-
Header Files
@@ -686,28 +686,28 @@
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
diff --git a/src/libsodium/Makefile.am b/src/libsodium/Makefile.am
index b0b78d95..83aac249 100644
--- a/src/libsodium/Makefile.am
+++ b/src/libsodium/Makefile.am
@@ -12,7 +12,7 @@ libsodium_la_SOURCES = \
crypto_box/crypto_box_easy.c \
crypto_box/crypto_box_seal.c \
crypto_box/curve25519xsalsa20poly1305/box_curve25519xsalsa20poly1305.c \
- crypto_core/curve25519/ref10/curve25519_ref10.c \
+ crypto_core/ed25519/ref10/ed25519_ref10.c \
crypto_core/hchacha20/core_hchacha20.c \
crypto_core/hsalsa20/ref2/core_hsalsa20_ref2.c \
crypto_core/hsalsa20/core_hsalsa20.c \
@@ -69,10 +69,10 @@ libsodium_la_SOURCES = \
crypto_shorthash/siphash24/ref/shorthash_siphash_ref.h \
crypto_sign/crypto_sign.c \
crypto_sign/ed25519/sign_ed25519.c \
- crypto_sign/ed25519/ref10/ed25519_ref10.h \
crypto_sign/ed25519/ref10/keypair.c \
crypto_sign/ed25519/ref10/open.c \
crypto_sign/ed25519/ref10/sign.c \
+ crypto_sign/ed25519/ref10/sign_ed25519_ref10.h \
crypto_stream/chacha20/stream_chacha20.c \
crypto_stream/chacha20/stream_chacha20.h \
crypto_stream/chacha20/ref/chacha20_ref.h \
@@ -83,7 +83,7 @@ libsodium_la_SOURCES = \
crypto_stream/xsalsa20/stream_xsalsa20.c \
crypto_verify/sodium/verify.c \
include/sodium/private/common.h \
- include/sodium/private/curve25519_ref10.h \
+ include/sodium/private/ed25519_ref10.h \
include/sodium/private/implementations.h \
include/sodium/private/mutex.h \
include/sodium/private/sse2_64_32.h \
@@ -110,18 +110,18 @@ endif
if HAVE_TI_MODE
libsodium_la_SOURCES += \
- crypto_core/curve25519/ref10/fe_51/base.h \
- crypto_core/curve25519/ref10/fe_51/base2.h \
- crypto_core/curve25519/ref10/fe_51/constants.h \
- crypto_core/curve25519/ref10/fe_51/fe.h \
- include/sodium/private/curve25519_ref10_fe_51.h
+ crypto_core/ed25519/ref10/fe_51/base.h \
+ crypto_core/ed25519/ref10/fe_51/base2.h \
+ crypto_core/ed25519/ref10/fe_51/constants.h \
+ crypto_core/ed25519/ref10/fe_51/fe.h \
+ include/sodium/private/ed25519_ref10_fe_51.h
else
libsodium_la_SOURCES += \
- crypto_core/curve25519/ref10/fe_25_5/base.h \
- crypto_core/curve25519/ref10/fe_25_5/base2.h \
- crypto_core/curve25519/ref10/fe_25_5/constants.h \
- crypto_core/curve25519/ref10/fe_25_5/fe.h \
- include/sodium/private/curve25519_ref10_fe_25_5.h
+ crypto_core/ed25519/ref10/fe_25_5/base.h \
+ crypto_core/ed25519/ref10/fe_25_5/base2.h \
+ crypto_core/ed25519/ref10/fe_25_5/constants.h \
+ crypto_core/ed25519/ref10/fe_25_5/fe.h \
+ include/sodium/private/ed25519_ref10_fe_25_5.h
endif
if HAVE_AMD64_ASM
diff --git a/src/libsodium/crypto_core/curve25519/ref10/curve25519_ref10.c b/src/libsodium/crypto_core/ed25519/ref10/ed25519_ref10.c
similarity index 99%
rename from src/libsodium/crypto_core/curve25519/ref10/curve25519_ref10.c
rename to src/libsodium/crypto_core/ed25519/ref10/ed25519_ref10.c
index c1dc27c5..6ddffa05 100644
--- a/src/libsodium/crypto_core/curve25519/ref10/curve25519_ref10.c
+++ b/src/libsodium/crypto_core/ed25519/ref10/ed25519_ref10.c
@@ -4,7 +4,7 @@
#include "crypto_verify_32.h"
#include "private/common.h"
-#include "private/curve25519_ref10.h"
+#include "private/ed25519_ref10.h"
#include "utils.h"
static inline uint64_t
diff --git a/src/libsodium/crypto_core/curve25519/ref10/fe_25_5/base.h b/src/libsodium/crypto_core/ed25519/ref10/fe_25_5/base.h
similarity index 100%
rename from src/libsodium/crypto_core/curve25519/ref10/fe_25_5/base.h
rename to src/libsodium/crypto_core/ed25519/ref10/fe_25_5/base.h
diff --git a/src/libsodium/crypto_core/curve25519/ref10/fe_25_5/base2.h b/src/libsodium/crypto_core/ed25519/ref10/fe_25_5/base2.h
similarity index 100%
rename from src/libsodium/crypto_core/curve25519/ref10/fe_25_5/base2.h
rename to src/libsodium/crypto_core/ed25519/ref10/fe_25_5/base2.h
diff --git a/src/libsodium/crypto_core/curve25519/ref10/fe_25_5/constants.h b/src/libsodium/crypto_core/ed25519/ref10/fe_25_5/constants.h
similarity index 100%
rename from src/libsodium/crypto_core/curve25519/ref10/fe_25_5/constants.h
rename to src/libsodium/crypto_core/ed25519/ref10/fe_25_5/constants.h
diff --git a/src/libsodium/crypto_core/curve25519/ref10/fe_25_5/fe.h b/src/libsodium/crypto_core/ed25519/ref10/fe_25_5/fe.h
similarity index 100%
rename from src/libsodium/crypto_core/curve25519/ref10/fe_25_5/fe.h
rename to src/libsodium/crypto_core/ed25519/ref10/fe_25_5/fe.h
diff --git a/src/libsodium/crypto_core/curve25519/ref10/fe_51/base.h b/src/libsodium/crypto_core/ed25519/ref10/fe_51/base.h
similarity index 100%
rename from src/libsodium/crypto_core/curve25519/ref10/fe_51/base.h
rename to src/libsodium/crypto_core/ed25519/ref10/fe_51/base.h
diff --git a/src/libsodium/crypto_core/curve25519/ref10/fe_51/base2.h b/src/libsodium/crypto_core/ed25519/ref10/fe_51/base2.h
similarity index 100%
rename from src/libsodium/crypto_core/curve25519/ref10/fe_51/base2.h
rename to src/libsodium/crypto_core/ed25519/ref10/fe_51/base2.h
diff --git a/src/libsodium/crypto_core/curve25519/ref10/fe_51/constants.h b/src/libsodium/crypto_core/ed25519/ref10/fe_51/constants.h
similarity index 100%
rename from src/libsodium/crypto_core/curve25519/ref10/fe_51/constants.h
rename to src/libsodium/crypto_core/ed25519/ref10/fe_51/constants.h
diff --git a/src/libsodium/crypto_core/curve25519/ref10/fe_51/fe.h b/src/libsodium/crypto_core/ed25519/ref10/fe_51/fe.h
similarity index 100%
rename from src/libsodium/crypto_core/curve25519/ref10/fe_51/fe.h
rename to src/libsodium/crypto_core/ed25519/ref10/fe_51/fe.h
diff --git a/src/libsodium/crypto_scalarmult/curve25519/ref10/x25519_ref10.c b/src/libsodium/crypto_scalarmult/curve25519/ref10/x25519_ref10.c
index adfa15c4..f80f28c9 100644
--- a/src/libsodium/crypto_scalarmult/curve25519/ref10/x25519_ref10.c
+++ b/src/libsodium/crypto_scalarmult/curve25519/ref10/x25519_ref10.c
@@ -3,7 +3,7 @@
#include
#include "../scalarmult_curve25519.h"
-#include "private/curve25519_ref10.h"
+#include "private/ed25519_ref10.h"
#include "utils.h"
#include "x25519_ref10.h"
diff --git a/src/libsodium/crypto_scalarmult/ed25519/ref10/scalarmult_ed25519_ref10.c b/src/libsodium/crypto_scalarmult/ed25519/ref10/scalarmult_ed25519_ref10.c
index c26dc5b7..de67c670 100644
--- a/src/libsodium/crypto_scalarmult/ed25519/ref10/scalarmult_ed25519_ref10.c
+++ b/src/libsodium/crypto_scalarmult/ed25519/ref10/scalarmult_ed25519_ref10.c
@@ -2,7 +2,7 @@
#include
#include "crypto_scalarmult_ed25519.h"
-#include "private/curve25519_ref10.h"
+#include "private/ed25519_ref10.h"
#include "utils.h"
static int
diff --git a/src/libsodium/crypto_sign/ed25519/ref10/keypair.c b/src/libsodium/crypto_sign/ed25519/ref10/keypair.c
index 915a3567..8bf3cec8 100644
--- a/src/libsodium/crypto_sign/ed25519/ref10/keypair.c
+++ b/src/libsodium/crypto_sign/ed25519/ref10/keypair.c
@@ -4,8 +4,8 @@
#include "crypto_hash_sha512.h"
#include "crypto_scalarmult_curve25519.h"
#include "crypto_sign_ed25519.h"
-#include "ed25519_ref10.h"
-#include "private/curve25519_ref10.h"
+#include "sign_ed25519_ref10.h"
+#include "private/ed25519_ref10.h"
#include "randombytes.h"
#include "utils.h"
diff --git a/src/libsodium/crypto_sign/ed25519/ref10/obsolete.c b/src/libsodium/crypto_sign/ed25519/ref10/obsolete.c
index 8f7e3104..03440cfa 100644
--- a/src/libsodium/crypto_sign/ed25519/ref10/obsolete.c
+++ b/src/libsodium/crypto_sign/ed25519/ref10/obsolete.c
@@ -6,7 +6,7 @@
#include "crypto_hash_sha512.h"
#include "crypto_sign_edwards25519sha512batch.h"
#include "crypto_verify_32.h"
-#include "private/curve25519_ref10.h"
+#include "private/ed25519_ref10.h"
#include "randombytes.h"
#include "utils.h"
diff --git a/src/libsodium/crypto_sign/ed25519/ref10/open.c b/src/libsodium/crypto_sign/ed25519/ref10/open.c
index 2e527d03..4d2c5bc3 100644
--- a/src/libsodium/crypto_sign/ed25519/ref10/open.c
+++ b/src/libsodium/crypto_sign/ed25519/ref10/open.c
@@ -6,8 +6,8 @@
#include "crypto_hash_sha512.h"
#include "crypto_sign_ed25519.h"
#include "crypto_verify_32.h"
-#include "ed25519_ref10.h"
-#include "private/curve25519_ref10.h"
+#include "sign_ed25519_ref10.h"
+#include "private/ed25519_ref10.h"
#include "utils.h"
int
diff --git a/src/libsodium/crypto_sign/ed25519/ref10/sign.c b/src/libsodium/crypto_sign/ed25519/ref10/sign.c
index 1131dbd4..4df90bdd 100644
--- a/src/libsodium/crypto_sign/ed25519/ref10/sign.c
+++ b/src/libsodium/crypto_sign/ed25519/ref10/sign.c
@@ -3,8 +3,8 @@
#include "crypto_hash_sha512.h"
#include "crypto_sign_ed25519.h"
-#include "ed25519_ref10.h"
-#include "private/curve25519_ref10.h"
+#include "sign_ed25519_ref10.h"
+#include "private/ed25519_ref10.h"
#include "randombytes.h"
#include "utils.h"
diff --git a/src/libsodium/crypto_sign/ed25519/ref10/ed25519_ref10.h b/src/libsodium/crypto_sign/ed25519/ref10/sign_ed25519_ref10.h
similarity index 92%
rename from src/libsodium/crypto_sign/ed25519/ref10/ed25519_ref10.h
rename to src/libsodium/crypto_sign/ed25519/ref10/sign_ed25519_ref10.h
index 8d93892b..29f45a85 100644
--- a/src/libsodium/crypto_sign/ed25519/ref10/ed25519_ref10.h
+++ b/src/libsodium/crypto_sign/ed25519/ref10/sign_ed25519_ref10.h
@@ -1,5 +1,5 @@
-#ifndef ed25519_ref10_H
-#define ed25519_ref10_H
+#ifndef sign_ed25519_ref10_H
+#define sign_ed25519_ref10_H
void _crypto_sign_ed25519_ref10_hinit(crypto_hash_sha512_state *hs,
int prehashed);
diff --git a/src/libsodium/crypto_sign/ed25519/sign_ed25519.c b/src/libsodium/crypto_sign/ed25519/sign_ed25519.c
index e2a5a4a6..ce4f162a 100644
--- a/src/libsodium/crypto_sign/ed25519/sign_ed25519.c
+++ b/src/libsodium/crypto_sign/ed25519/sign_ed25519.c
@@ -3,7 +3,7 @@
#include "crypto_hash_sha512.h"
#include "crypto_sign_ed25519.h"
-#include "ref10/ed25519_ref10.h"
+#include "private/ed25519_ref10.h"
size_t
crypto_sign_ed25519ph_statebytes(void)
diff --git a/src/libsodium/include/sodium/private/curve25519_ref10.h b/src/libsodium/include/sodium/private/ed25519_ref10.h
similarity index 95%
rename from src/libsodium/include/sodium/private/curve25519_ref10.h
rename to src/libsodium/include/sodium/private/ed25519_ref10.h
index 7e325208..dc45369a 100644
--- a/src/libsodium/include/sodium/private/curve25519_ref10.h
+++ b/src/libsodium/include/sodium/private/ed25519_ref10.h
@@ -1,5 +1,5 @@
-#ifndef curve25519_ref10_H
-#define curve25519_ref10_H
+#ifndef ed25519_ref10_H
+#define ed25519_ref10_H
#include
#include
@@ -20,9 +20,9 @@ void fe25519_frombytes(fe25519 h, const unsigned char *s);
void fe25519_tobytes(unsigned char *s, const fe25519 h);
#ifdef HAVE_TI_MODE
-# include "curve25519_ref10_fe_51.h"
+# include "ed25519_ref10_fe_51.h"
#else
-# include "curve25519_ref10_fe_25_5.h"
+# include "ed25519_ref10_fe_25_5.h"
#endif
diff --git a/src/libsodium/include/sodium/private/curve25519_ref10_fe_25_5.h b/src/libsodium/include/sodium/private/ed25519_ref10_fe_25_5.h
similarity index 100%
rename from src/libsodium/include/sodium/private/curve25519_ref10_fe_25_5.h
rename to src/libsodium/include/sodium/private/ed25519_ref10_fe_25_5.h
diff --git a/src/libsodium/include/sodium/private/curve25519_ref10_fe_51.h b/src/libsodium/include/sodium/private/ed25519_ref10_fe_51.h
similarity index 100%
rename from src/libsodium/include/sodium/private/curve25519_ref10_fe_51.h
rename to src/libsodium/include/sodium/private/ed25519_ref10_fe_51.h