From 5f187770f36e5049f54a3c717e8c71e3c824e5ba Mon Sep 17 00:00:00 2001
From: kinichiro <kinichiro.inoguchi@gmail.com>
Date: Sun, 6 Nov 2016 04:57:23 +0900
Subject: [PATCH] Add curve25519 to portable

---
 crypto/CMakeLists.txt | 2 ++
 crypto/Makefile.am    | 6 ++++++
 tests/CMakeLists.txt  | 5 +++++
 tests/Makefile.am     | 5 +++++
 update.sh             | 2 +-
 5 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index 895f419..2b48d32 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -281,6 +281,8 @@ set(
 	conf/conf_mall.c
 	conf/conf_mod.c
 	conf/conf_sap.c
+	curve25519/curve25519-generic.c
+	curve25519/curve25519.c
 	des/cbc_cksm.c
 	des/cbc_enc.c
 	des/cfb64ede.c
diff --git a/crypto/Makefile.am b/crypto/Makefile.am
index 1398863..5b7aa95 100644
--- a/crypto/Makefile.am
+++ b/crypto/Makefile.am
@@ -344,6 +344,12 @@ libcrypto_la_SOURCES += conf/conf_mod.c
 libcrypto_la_SOURCES += conf/conf_sap.c
 noinst_HEADERS += conf/conf_def.h
 
+# curve25519
+libcrypto_la_SOURCES += curve25519/curve25519-generic.c
+libcrypto_la_SOURCES += curve25519/curve25519.c
+noinst_HEADERS += curve25519/curve25519_internal.h
+
+
 # des
 libcrypto_la_SOURCES += des/cbc_cksm.c
 libcrypto_la_SOURCES += des/cbc_enc.c
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 7957235..2cc4c9b 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -341,3 +341,8 @@ add_test(utf8test utf8test)
 add_executable(verifytest verifytest.c)
 target_link_libraries(verifytest tls ${OPENSSL_LIBS})
 add_test(verifytest verifytest)
+
+# x25519test
+add_executable(x25519test x25519test.c)
+target_link_libraries(x25519test ${OPENSSL_LIBS})
+add_test(x25519test x25519test)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5c575a8..4309fcb 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -338,3 +338,8 @@ utf8test_SOURCES = utf8test.c
 TESTS += verifytest
 check_PROGRAMS += verifytest
 verifytest_SOURCES = verifytest.c
+
+# x25519test
+TESTS += x25519test
+check_PROGRAMS += x25519test
+x25519test_SOURCES = x25519test.c
diff --git a/update.sh b/update.sh
index e7e8fd5..98a9aaa 100755
--- a/update.sh
+++ b/update.sh
@@ -124,7 +124,7 @@ copy_hdrs $libcrypto_src "stack/stack.h lhash/lhash.h stack/safestack.h
 	md4/md4.h ripemd/ripemd.h whrlpool/whrlpool.h idea/idea.h
 	rc2/rc2.h rc4/rc4.h ui/ui_compat.h txt_db/txt_db.h
 	chacha/chacha.h evp/evp.h poly1305/poly1305.h camellia/camellia.h
-	gost/gost.h"
+	gost/gost.h curve25519/curve25519.h"
 
 copy_hdrs $libssl_src "srtp.h ssl.h ssl2.h ssl3.h ssl23.h tls1.h dtls1.h"