From 97b09aba0bbbc784ace1fe2800862dd02cb4eddb Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Mon, 4 Apr 2016 18:03:08 +0200
Subject: [PATCH] Move curve25519_ref10.h to include/sodium/private/

---
 src/libsodium/Makefile.am                                       | 2 +-
 src/libsodium/crypto_core/curve25519/ref10/curve25519_ref10.c   | 2 +-
 src/libsodium/crypto_scalarmult/curve25519/ref10/x25519_ref10.c | 2 +-
 src/libsodium/crypto_sign/ed25519/ref10/keypair.c               | 2 +-
 src/libsodium/crypto_sign/ed25519/ref10/obsolete.c              | 2 +-
 src/libsodium/crypto_sign/ed25519/ref10/open.c                  | 2 +-
 src/libsodium/crypto_sign/ed25519/ref10/sign.c                  | 2 +-
 .../ref10 => include/sodium/private}/curve25519_ref10.h         | 0
 8 files changed, 7 insertions(+), 7 deletions(-)
 rename src/libsodium/{crypto_core/curve25519/ref10 => include/sodium/private}/curve25519_ref10.h (100%)

diff --git a/src/libsodium/Makefile.am b/src/libsodium/Makefile.am
index 07214bee..03cb5fbb 100644
--- a/src/libsodium/Makefile.am
+++ b/src/libsodium/Makefile.am
@@ -24,7 +24,6 @@ libsodium_la_SOURCES = \
 	crypto_core/curve25519/ref10/base.h \
 	crypto_core/curve25519/ref10/base2.h \
 	crypto_core/curve25519/ref10/curve25519_ref10.c \
-	crypto_core/curve25519/ref10/curve25519_ref10.h \
 	crypto_core/hsalsa20/ref2/core_hsalsa20.c \
 	crypto_core/hsalsa20/core_hsalsa20_api.c \
 	crypto_core/salsa20/ref/core_salsa20.c \
@@ -102,6 +101,7 @@ libsodium_la_SOURCES = \
 	crypto_verify/64/verify_64_api.c \
 	crypto_verify/64/ref/verify_64.c \
 	include/sodium/private/common.h \
+	include/sodium/private/curve25519_ref10.h \
 	randombytes/randombytes.c \
 	sodium/core.c \
 	sodium/runtime.c \
diff --git a/src/libsodium/crypto_core/curve25519/ref10/curve25519_ref10.c b/src/libsodium/crypto_core/curve25519/ref10/curve25519_ref10.c
index aa315789..c0c9d56e 100644
--- a/src/libsodium/crypto_core/curve25519/ref10/curve25519_ref10.c
+++ b/src/libsodium/crypto_core/curve25519/ref10/curve25519_ref10.c
@@ -1,8 +1,8 @@
 #include <stddef.h>
 #include <stdint.h>
 #include <string.h>
-#include "curve25519_ref10.h"
 #include "crypto_verify_32.h"
+#include "private/curve25519_ref10.h"
 
 static uint64_t load_3(const unsigned char *in)
 {
diff --git a/src/libsodium/crypto_scalarmult/curve25519/ref10/x25519_ref10.c b/src/libsodium/crypto_scalarmult/curve25519/ref10/x25519_ref10.c
index 79369a92..1f06e71d 100644
--- a/src/libsodium/crypto_scalarmult/curve25519/ref10/x25519_ref10.c
+++ b/src/libsodium/crypto_scalarmult/curve25519/ref10/x25519_ref10.c
@@ -7,7 +7,7 @@
 #include "utils.h"
 #include "x25519_ref10.h"
 #include "../scalarmult_curve25519.h"
-#include "../../../crypto_core/curve25519/ref10/curve25519_ref10.h"
+#include "private/curve25519_ref10.h"
 
 /*
 Replace (f,g) with (g,f) if b == 1;
diff --git a/src/libsodium/crypto_sign/ed25519/ref10/keypair.c b/src/libsodium/crypto_sign/ed25519/ref10/keypair.c
index a9c39664..de1c652b 100644
--- a/src/libsodium/crypto_sign/ed25519/ref10/keypair.c
+++ b/src/libsodium/crypto_sign/ed25519/ref10/keypair.c
@@ -6,7 +6,7 @@
 #include "crypto_scalarmult_curve25519.h"
 #include "randombytes.h"
 #include "utils.h"
-#include "../../../crypto_core/curve25519/ref10/curve25519_ref10.h"
+#include "private/curve25519_ref10.h"
 
 int crypto_sign_ed25519_seed_keypair(unsigned char *pk, unsigned char *sk,
                                      const unsigned char *seed)
diff --git a/src/libsodium/crypto_sign/ed25519/ref10/obsolete.c b/src/libsodium/crypto_sign/ed25519/ref10/obsolete.c
index 2c644ad0..37b756b5 100644
--- a/src/libsodium/crypto_sign/ed25519/ref10/obsolete.c
+++ b/src/libsodium/crypto_sign/ed25519/ref10/obsolete.c
@@ -8,7 +8,7 @@
 #include "crypto_verify_32.h"
 #include "randombytes.h"
 #include "utils.h"
-#include "../../../crypto_core/curve25519/ref10/curve25519_ref10.h"
+#include "private/curve25519_ref10.h"
 
 int crypto_sign_edwards25519sha512batch_keypair(unsigned char *pk,
                                                 unsigned char *sk)
diff --git a/src/libsodium/crypto_sign/ed25519/ref10/open.c b/src/libsodium/crypto_sign/ed25519/ref10/open.c
index 6da27fb1..2731e813 100644
--- a/src/libsodium/crypto_sign/ed25519/ref10/open.c
+++ b/src/libsodium/crypto_sign/ed25519/ref10/open.c
@@ -7,7 +7,7 @@
 #include "crypto_sign_ed25519.h"
 #include "crypto_verify_32.h"
 #include "utils.h"
-#include "../../../crypto_core/curve25519/ref10/curve25519_ref10.h"
+#include "private/curve25519_ref10.h"
 
 #ifndef ED25519_COMPAT
 static int
diff --git a/src/libsodium/crypto_sign/ed25519/ref10/sign.c b/src/libsodium/crypto_sign/ed25519/ref10/sign.c
index 46c108cc..7ebc20cd 100644
--- a/src/libsodium/crypto_sign/ed25519/ref10/sign.c
+++ b/src/libsodium/crypto_sign/ed25519/ref10/sign.c
@@ -4,7 +4,7 @@
 #include "crypto_hash_sha512.h"
 #include "crypto_sign_ed25519.h"
 #include "utils.h"
-#include "../../../crypto_core/curve25519/ref10/curve25519_ref10.h"
+#include "private/curve25519_ref10.h"
 
 int
 crypto_sign_ed25519_detached(unsigned char *sig, unsigned long long *siglen_p,
diff --git a/src/libsodium/crypto_core/curve25519/ref10/curve25519_ref10.h b/src/libsodium/include/sodium/private/curve25519_ref10.h
similarity index 100%
rename from src/libsodium/crypto_core/curve25519/ref10/curve25519_ref10.h
rename to src/libsodium/include/sodium/private/curve25519_ref10.h