From f15182a737b9e696b888d7702906e4fb8016c787 Mon Sep 17 00:00:00 2001 From: Arvid Norberg Date: Sat, 19 Jul 2014 07:12:20 +0000 Subject: [PATCH] merged changes from RC_1_0 --- Makefile.am | 1 - ed25519/src/add_scalar.cpp | 2 +- ed25519/src/key_exchange.cpp | 2 +- ed25519/src/keypair.cpp | 2 +- ed25519/src/seed.cpp | 2 +- ed25519/src/sign.cpp | 2 +- ed25519/src/verify.cpp | 2 +- include/libtorrent/Makefile.am | 1 + {ed25519/src => include/libtorrent}/ed25519.hpp | 0 src/kademlia/item.cpp | 3 +-- tools/dht_put.cpp | 3 ++- 11 files changed, 10 insertions(+), 10 deletions(-) rename {ed25519/src => include/libtorrent}/ed25519.hpp (100%) diff --git a/Makefile.am b/Makefile.am index 5a85716c1..12341b1f8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -131,7 +131,6 @@ DOCS_PAGES = \ ED25519_SOURCE = \ ed25519/readme.md \ ed25519/test.cpp \ - ed25519/src/ed25519.hpp \ ed25519/src/fe.h \ ed25519/src/fixedint.h \ ed25519/src/ge.h \ diff --git a/ed25519/src/add_scalar.cpp b/ed25519/src/add_scalar.cpp index 33ab71b7c..72cc852b9 100644 --- a/ed25519/src/add_scalar.cpp +++ b/ed25519/src/add_scalar.cpp @@ -1,4 +1,4 @@ -#include "ed25519.hpp" +#include "libtorrent/ed25519.hpp" #include "ge.h" #include "sc.h" diff --git a/ed25519/src/key_exchange.cpp b/ed25519/src/key_exchange.cpp index dbcf50331..b0b090758 100644 --- a/ed25519/src/key_exchange.cpp +++ b/ed25519/src/key_exchange.cpp @@ -1,4 +1,4 @@ -#include "ed25519.hpp" +#include "libtorrent/ed25519.hpp" #include "fe.h" void ed25519_key_exchange(unsigned char *shared_secret diff --git a/ed25519/src/keypair.cpp b/ed25519/src/keypair.cpp index b5c2cf201..7d2d14338 100644 --- a/ed25519/src/keypair.cpp +++ b/ed25519/src/keypair.cpp @@ -1,4 +1,4 @@ -#include "ed25519.hpp" +#include "libtorrent/ed25519.hpp" #include "sha512.h" #include "ge.h" diff --git a/ed25519/src/seed.cpp b/ed25519/src/seed.cpp index 5759f5184..7619c66bc 100644 --- a/ed25519/src/seed.cpp +++ b/ed25519/src/seed.cpp @@ -1,4 +1,4 @@ -#include "ed25519.hpp" +#include "libtorrent/ed25519.hpp" #ifndef ED25519_NO_SEED diff --git a/ed25519/src/sign.cpp b/ed25519/src/sign.cpp index 9dbc4d001..6badd2c03 100644 --- a/ed25519/src/sign.cpp +++ b/ed25519/src/sign.cpp @@ -1,4 +1,4 @@ -#include "ed25519.hpp" +#include "libtorrent/ed25519.hpp" #include "sha512.h" #include "ge.h" #include "sc.h" diff --git a/ed25519/src/verify.cpp b/ed25519/src/verify.cpp index c50c989ec..37b4ed573 100644 --- a/ed25519/src/verify.cpp +++ b/ed25519/src/verify.cpp @@ -1,4 +1,4 @@ -#include "ed25519.hpp" +#include "libtorrent/ed25519.hpp" #include "sha512.h" #include "ge.h" #include "sc.h" diff --git a/include/libtorrent/Makefile.am b/include/libtorrent/Makefile.am index 6750f5897..017ab1600 100644 --- a/include/libtorrent/Makefile.am +++ b/include/libtorrent/Makefile.am @@ -47,6 +47,7 @@ nobase_include_HEADERS = \ disk_io_thread.hpp \ disk_observer.hpp \ disk_job_pool.hpp \ + ed25519.hpp \ entry.hpp \ enum_net.hpp \ error.hpp \ diff --git a/ed25519/src/ed25519.hpp b/include/libtorrent/ed25519.hpp similarity index 100% rename from ed25519/src/ed25519.hpp rename to include/libtorrent/ed25519.hpp diff --git a/src/kademlia/item.cpp b/src/kademlia/item.cpp index 60733bcf9..dbffdea61 100644 --- a/src/kademlia/item.cpp +++ b/src/kademlia/item.cpp @@ -33,8 +33,7 @@ POSSIBILITY OF SUCH DAMAGE. #include #include #include - -#include "ed25519.hpp" +#include #ifdef TORRENT_DEBUG #include "libtorrent/lazy_entry.hpp" diff --git a/tools/dht_put.cpp b/tools/dht_put.cpp index 994b49b44..f02e3f668 100644 --- a/tools/dht_put.cpp +++ b/tools/dht_put.cpp @@ -36,7 +36,8 @@ POSSIBILITY OF SUCH DAMAGE. #include "libtorrent/alert_types.hpp" #include "libtorrent/bencode.hpp" // for bencode() #include "libtorrent/kademlia/item.hpp" // for sign_mutable_item -#include "ed25519.h" +#include "libtorrent/ed25519.h" + #include #include