diff --git a/.gitignore b/.gitignore index d3224335..4a758099 100644 --- a/.gitignore +++ b/.gitignore @@ -38,12 +38,11 @@ m4/lt~obsolete.m4 man/*.html man/Makefile.in missing -src/libsodium/curvecp/curvecpclient -src/libsodium/curvecp/curvecpmakekey -src/libsodium/curvecp/curvecpmessage -src/libsodium/curvecp/curvecpprintkey -src/libsodium/curvecp/curvecpserver -src/libsodium/include/sodium/version.h +src/curvecp/curvecpclient +src/curvecp/curvecpmakekey +src/curvecp/curvecpmessage +src/curvecp/curvecpprintkey +src/curvecp/curvecpserver stamp-* test/default/*.res test/default/*.trs diff --git a/configure.ac b/configure.ac index f01df625..640a9ac4 100644 --- a/configure.ac +++ b/configure.ac @@ -226,8 +226,9 @@ AH_VERBATIM([NDEBUG], [/* Never ever ignore assertions */ AC_CONFIG_FILES([Makefile src/Makefile + src/curvecp/Makefile + src/curvecp/libcurvecp/Makefile src/libsodium/Makefile - src/libsodium/curvecp/Makefile src/libsodium/include/Makefile src/libsodium/include/sodium/version.h test/default/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index 64445045..e6cdd8a1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,3 +1,4 @@ SUBDIRS = \ - libsodium + libsodium \ + curvecp diff --git a/src/curvecp/Makefile.am b/src/curvecp/Makefile.am new file mode 100644 index 00000000..00ab962c --- /dev/null +++ b/src/curvecp/Makefile.am @@ -0,0 +1,32 @@ + +AM_CPPFLAGS = \ + -I$(top_srcdir)/src/libsodium/include/sodium \ + -Ilibcurvecp + +LDADD = \ + libcurvecp/libcurvecp.la + +bin_PROGRAMS = \ + curvecpprintkey \ + curvecpmakekey \ + curvecpclient \ + curvecpserver \ + curvecpmessage + +curvecpprintkey_SOURCES = \ + curvecpprintkey.c + +curvecpmakekey_SOURCES = \ + curvecpmakekey.c + +curvecpclient_SOURCES = \ + curvecpclient.c + +curvecpserver_SOURCES = \ + curvecpserver.c + +curvecpmessage_SOURCES = \ + curvecpmessage.c + +SUBDIRS = \ + libcurvecp diff --git a/src/libsodium/curvecp/curvecpclient.c b/src/curvecp/curvecpclient.c similarity index 100% rename from src/libsodium/curvecp/curvecpclient.c rename to src/curvecp/curvecpclient.c diff --git a/src/libsodium/curvecp/curvecpmakekey.c b/src/curvecp/curvecpmakekey.c similarity index 100% rename from src/libsodium/curvecp/curvecpmakekey.c rename to src/curvecp/curvecpmakekey.c diff --git a/src/libsodium/curvecp/curvecpmessage.c b/src/curvecp/curvecpmessage.c similarity index 100% rename from src/libsodium/curvecp/curvecpmessage.c rename to src/curvecp/curvecpmessage.c diff --git a/src/libsodium/curvecp/curvecpprintkey.c b/src/curvecp/curvecpprintkey.c similarity index 100% rename from src/libsodium/curvecp/curvecpprintkey.c rename to src/curvecp/curvecpprintkey.c diff --git a/src/libsodium/curvecp/curvecpserver.c b/src/curvecp/curvecpserver.c similarity index 100% rename from src/libsodium/curvecp/curvecpserver.c rename to src/curvecp/curvecpserver.c diff --git a/src/libsodium/curvecp/Makefile.am b/src/curvecp/libcurvecp/Makefile.am similarity index 71% rename from src/libsodium/curvecp/Makefile.am rename to src/curvecp/libcurvecp/Makefile.am index 64dd1fea..a91343ee 100644 --- a/src/libsodium/curvecp/Makefile.am +++ b/src/curvecp/libcurvecp/Makefile.am @@ -67,31 +67,3 @@ libcurvecp_la_LDFLAGS = \ libcurvecp_la_CPPFLAGS = \ $(LTDLINCL) \ -I$(top_srcdir)/src/libsodium/include/sodium - -AM_CPPFLAGS = \ - -I$(top_srcdir)/src/libsodium/include/sodium - -LDADD = \ - libcurvecp.la - -bin_PROGRAMS = \ - curvecpprintkey \ - curvecpmakekey \ - curvecpclient \ - curvecpserver \ - curvecpmessage - -curvecpprintkey_SOURCES = \ - curvecpprintkey.c - -curvecpmakekey_SOURCES = \ - curvecpmakekey.c - -curvecpclient_SOURCES = \ - curvecpclient.c - -curvecpserver_SOURCES = \ - curvecpserver.c - -curvecpmessage_SOURCES = \ - curvecpmessage.c diff --git a/src/libsodium/curvecp/blocking.c b/src/curvecp/libcurvecp/blocking.c similarity index 100% rename from src/libsodium/curvecp/blocking.c rename to src/curvecp/libcurvecp/blocking.c diff --git a/src/libsodium/curvecp/blocking.h b/src/curvecp/libcurvecp/blocking.h similarity index 100% rename from src/libsodium/curvecp/blocking.h rename to src/curvecp/libcurvecp/blocking.h diff --git a/src/libsodium/curvecp/byte.h b/src/curvecp/libcurvecp/byte.h similarity index 100% rename from src/libsodium/curvecp/byte.h rename to src/curvecp/libcurvecp/byte.h diff --git a/src/libsodium/curvecp/byte_copy.c b/src/curvecp/libcurvecp/byte_copy.c similarity index 100% rename from src/libsodium/curvecp/byte_copy.c rename to src/curvecp/libcurvecp/byte_copy.c diff --git a/src/libsodium/curvecp/byte_isequal.c b/src/curvecp/libcurvecp/byte_isequal.c similarity index 100% rename from src/libsodium/curvecp/byte_isequal.c rename to src/curvecp/libcurvecp/byte_isequal.c diff --git a/src/libsodium/curvecp/byte_zero.c b/src/curvecp/libcurvecp/byte_zero.c similarity index 100% rename from src/libsodium/curvecp/byte_zero.c rename to src/curvecp/libcurvecp/byte_zero.c diff --git a/src/libsodium/curvecp/crypto_block.c b/src/curvecp/libcurvecp/crypto_block.c similarity index 100% rename from src/libsodium/curvecp/crypto_block.c rename to src/curvecp/libcurvecp/crypto_block.c diff --git a/src/libsodium/curvecp/crypto_block.h b/src/curvecp/libcurvecp/crypto_block.h similarity index 100% rename from src/libsodium/curvecp/crypto_block.h rename to src/curvecp/libcurvecp/crypto_block.h diff --git a/src/libsodium/curvecp/die.c b/src/curvecp/libcurvecp/die.c similarity index 100% rename from src/libsodium/curvecp/die.c rename to src/curvecp/libcurvecp/die.c diff --git a/src/libsodium/curvecp/die.h b/src/curvecp/libcurvecp/die.h similarity index 100% rename from src/libsodium/curvecp/die.h rename to src/curvecp/libcurvecp/die.h diff --git a/src/libsodium/curvecp/e.c b/src/curvecp/libcurvecp/e.c similarity index 100% rename from src/libsodium/curvecp/e.c rename to src/curvecp/libcurvecp/e.c diff --git a/src/libsodium/curvecp/e.h b/src/curvecp/libcurvecp/e.h similarity index 100% rename from src/libsodium/curvecp/e.h rename to src/curvecp/libcurvecp/e.h diff --git a/src/libsodium/curvecp/hexparse.c b/src/curvecp/libcurvecp/hexparse.c similarity index 100% rename from src/libsodium/curvecp/hexparse.c rename to src/curvecp/libcurvecp/hexparse.c diff --git a/src/libsodium/curvecp/hexparse.h b/src/curvecp/libcurvecp/hexparse.h similarity index 100% rename from src/libsodium/curvecp/hexparse.h rename to src/curvecp/libcurvecp/hexparse.h diff --git a/src/libsodium/curvecp/load.c b/src/curvecp/libcurvecp/load.c similarity index 100% rename from src/libsodium/curvecp/load.c rename to src/curvecp/libcurvecp/load.c diff --git a/src/libsodium/curvecp/load.h b/src/curvecp/libcurvecp/load.h similarity index 100% rename from src/libsodium/curvecp/load.h rename to src/curvecp/libcurvecp/load.h diff --git a/src/libsodium/curvecp/nameparse.c b/src/curvecp/libcurvecp/nameparse.c similarity index 100% rename from src/libsodium/curvecp/nameparse.c rename to src/curvecp/libcurvecp/nameparse.c diff --git a/src/libsodium/curvecp/nameparse.h b/src/curvecp/libcurvecp/nameparse.h similarity index 100% rename from src/libsodium/curvecp/nameparse.h rename to src/curvecp/libcurvecp/nameparse.h diff --git a/src/libsodium/curvecp/nanoseconds.c b/src/curvecp/libcurvecp/nanoseconds.c similarity index 100% rename from src/libsodium/curvecp/nanoseconds.c rename to src/curvecp/libcurvecp/nanoseconds.c diff --git a/src/libsodium/curvecp/nanoseconds.h b/src/curvecp/libcurvecp/nanoseconds.h similarity index 100% rename from src/libsodium/curvecp/nanoseconds.h rename to src/curvecp/libcurvecp/nanoseconds.h diff --git a/src/libsodium/curvecp/open.h b/src/curvecp/libcurvecp/open.h similarity index 100% rename from src/libsodium/curvecp/open.h rename to src/curvecp/libcurvecp/open.h diff --git a/src/libsodium/curvecp/open_cwd.c b/src/curvecp/libcurvecp/open_cwd.c similarity index 100% rename from src/libsodium/curvecp/open_cwd.c rename to src/curvecp/libcurvecp/open_cwd.c diff --git a/src/libsodium/curvecp/open_lock.c b/src/curvecp/libcurvecp/open_lock.c similarity index 100% rename from src/libsodium/curvecp/open_lock.c rename to src/curvecp/libcurvecp/open_lock.c diff --git a/src/libsodium/curvecp/open_pipe.c b/src/curvecp/libcurvecp/open_pipe.c similarity index 100% rename from src/libsodium/curvecp/open_pipe.c rename to src/curvecp/libcurvecp/open_pipe.c diff --git a/src/libsodium/curvecp/open_read.c b/src/curvecp/libcurvecp/open_read.c similarity index 100% rename from src/libsodium/curvecp/open_read.c rename to src/curvecp/libcurvecp/open_read.c diff --git a/src/libsodium/curvecp/open_write.c b/src/curvecp/libcurvecp/open_write.c similarity index 100% rename from src/libsodium/curvecp/open_write.c rename to src/curvecp/libcurvecp/open_write.c diff --git a/src/libsodium/curvecp/portparse.c b/src/curvecp/libcurvecp/portparse.c similarity index 100% rename from src/libsodium/curvecp/portparse.c rename to src/curvecp/libcurvecp/portparse.c diff --git a/src/libsodium/curvecp/portparse.h b/src/curvecp/libcurvecp/portparse.h similarity index 100% rename from src/libsodium/curvecp/portparse.h rename to src/curvecp/libcurvecp/portparse.h diff --git a/src/libsodium/curvecp/randommod.c b/src/curvecp/libcurvecp/randommod.c similarity index 100% rename from src/libsodium/curvecp/randommod.c rename to src/curvecp/libcurvecp/randommod.c diff --git a/src/libsodium/curvecp/randommod.h b/src/curvecp/libcurvecp/randommod.h similarity index 100% rename from src/libsodium/curvecp/randommod.h rename to src/curvecp/libcurvecp/randommod.h diff --git a/src/libsodium/curvecp/safenonce.c b/src/curvecp/libcurvecp/safenonce.c similarity index 100% rename from src/libsodium/curvecp/safenonce.c rename to src/curvecp/libcurvecp/safenonce.c diff --git a/src/libsodium/curvecp/safenonce.h b/src/curvecp/libcurvecp/safenonce.h similarity index 100% rename from src/libsodium/curvecp/safenonce.h rename to src/curvecp/libcurvecp/safenonce.h diff --git a/src/libsodium/curvecp/savesync.c b/src/curvecp/libcurvecp/savesync.c similarity index 100% rename from src/libsodium/curvecp/savesync.c rename to src/curvecp/libcurvecp/savesync.c diff --git a/src/libsodium/curvecp/savesync.h b/src/curvecp/libcurvecp/savesync.h similarity index 100% rename from src/libsodium/curvecp/savesync.h rename to src/curvecp/libcurvecp/savesync.h diff --git a/src/libsodium/curvecp/socket.h b/src/curvecp/libcurvecp/socket.h similarity index 100% rename from src/libsodium/curvecp/socket.h rename to src/curvecp/libcurvecp/socket.h diff --git a/src/libsodium/curvecp/socket_bind.c b/src/curvecp/libcurvecp/socket_bind.c similarity index 100% rename from src/libsodium/curvecp/socket_bind.c rename to src/curvecp/libcurvecp/socket_bind.c diff --git a/src/libsodium/curvecp/socket_recv.c b/src/curvecp/libcurvecp/socket_recv.c similarity index 100% rename from src/libsodium/curvecp/socket_recv.c rename to src/curvecp/libcurvecp/socket_recv.c diff --git a/src/libsodium/curvecp/socket_send.c b/src/curvecp/libcurvecp/socket_send.c similarity index 100% rename from src/libsodium/curvecp/socket_send.c rename to src/curvecp/libcurvecp/socket_send.c diff --git a/src/libsodium/curvecp/socket_udp.c b/src/curvecp/libcurvecp/socket_udp.c similarity index 100% rename from src/libsodium/curvecp/socket_udp.c rename to src/curvecp/libcurvecp/socket_udp.c diff --git a/src/libsodium/curvecp/uint16_pack.c b/src/curvecp/libcurvecp/uint16_pack.c similarity index 100% rename from src/libsodium/curvecp/uint16_pack.c rename to src/curvecp/libcurvecp/uint16_pack.c diff --git a/src/libsodium/curvecp/uint16_pack.h b/src/curvecp/libcurvecp/uint16_pack.h similarity index 100% rename from src/libsodium/curvecp/uint16_pack.h rename to src/curvecp/libcurvecp/uint16_pack.h diff --git a/src/libsodium/curvecp/uint16_unpack.c b/src/curvecp/libcurvecp/uint16_unpack.c similarity index 100% rename from src/libsodium/curvecp/uint16_unpack.c rename to src/curvecp/libcurvecp/uint16_unpack.c diff --git a/src/libsodium/curvecp/uint16_unpack.h b/src/curvecp/libcurvecp/uint16_unpack.h similarity index 100% rename from src/libsodium/curvecp/uint16_unpack.h rename to src/curvecp/libcurvecp/uint16_unpack.h diff --git a/src/libsodium/curvecp/uint32_pack.c b/src/curvecp/libcurvecp/uint32_pack.c similarity index 100% rename from src/libsodium/curvecp/uint32_pack.c rename to src/curvecp/libcurvecp/uint32_pack.c diff --git a/src/libsodium/curvecp/uint32_pack.h b/src/curvecp/libcurvecp/uint32_pack.h similarity index 100% rename from src/libsodium/curvecp/uint32_pack.h rename to src/curvecp/libcurvecp/uint32_pack.h diff --git a/src/libsodium/curvecp/uint32_unpack.c b/src/curvecp/libcurvecp/uint32_unpack.c similarity index 100% rename from src/libsodium/curvecp/uint32_unpack.c rename to src/curvecp/libcurvecp/uint32_unpack.c diff --git a/src/libsodium/curvecp/uint32_unpack.h b/src/curvecp/libcurvecp/uint32_unpack.h similarity index 100% rename from src/libsodium/curvecp/uint32_unpack.h rename to src/curvecp/libcurvecp/uint32_unpack.h diff --git a/src/libsodium/curvecp/uint64_pack.c b/src/curvecp/libcurvecp/uint64_pack.c similarity index 100% rename from src/libsodium/curvecp/uint64_pack.c rename to src/curvecp/libcurvecp/uint64_pack.c diff --git a/src/libsodium/curvecp/uint64_pack.h b/src/curvecp/libcurvecp/uint64_pack.h similarity index 100% rename from src/libsodium/curvecp/uint64_pack.h rename to src/curvecp/libcurvecp/uint64_pack.h diff --git a/src/libsodium/curvecp/uint64_unpack.c b/src/curvecp/libcurvecp/uint64_unpack.c similarity index 100% rename from src/libsodium/curvecp/uint64_unpack.c rename to src/curvecp/libcurvecp/uint64_unpack.c diff --git a/src/libsodium/curvecp/uint64_unpack.h b/src/curvecp/libcurvecp/uint64_unpack.h similarity index 100% rename from src/libsodium/curvecp/uint64_unpack.h rename to src/curvecp/libcurvecp/uint64_unpack.h diff --git a/src/libsodium/curvecp/writeall.c b/src/curvecp/libcurvecp/writeall.c similarity index 100% rename from src/libsodium/curvecp/writeall.c rename to src/curvecp/libcurvecp/writeall.c diff --git a/src/libsodium/curvecp/writeall.h b/src/curvecp/libcurvecp/writeall.h similarity index 100% rename from src/libsodium/curvecp/writeall.h rename to src/curvecp/libcurvecp/writeall.h diff --git a/src/libsodium/Makefile.am b/src/libsodium/Makefile.am index 636f6525..2a87f149 100644 --- a/src/libsodium/Makefile.am +++ b/src/libsodium/Makefile.am @@ -93,5 +93,4 @@ libsodium_la_CPPFLAGS = \ -I$(top_srcdir)/src/libsodium/include/sodium SUBDIRS = \ - curvecp \ include