Add crypto/ directory.

Destination.cpp

@@ -3,7 +3,7 @@
 #include <boost/lexical_cast.hpp>
 #include "Log.h"
 #include "util/util.h"
-#include "ElGamal.h"
+#include "crypto/ElGamal.h"
 #include "util/Timestamp.h"
 #include "NetDb.h"
 #include "AddressBook.h"

Destination.h

@@ -11,7 +11,7 @@
 #include <boost/asio.hpp>
 #include "Identity.h"
 #include "TunnelPool.h"
-#include "CryptoConst.h"
+#include "crypto/CryptoConst.h"
 #include "LeaseSet.h"
 #include "Garlic.h"
 #include "NetDb.h"

Garlic.h

@@ -9,7 +9,7 @@
 #include <mutex>
 #include <memory>
 #include <cryptopp/osrng.h>
-#include "aes.h"
+#include "crypto/aes.h"
 #include "I2NPProtocol.h"
 #include "LeaseSet.h"
 #include "util/Queue.h"

I2NPProtocol.cpp

@@ -2,7 +2,7 @@
 #include <atomic>
 #include "I2PEndian.h"
 #include <cryptopp/gzip.h>
-#include "ElGamal.h"
+#include "crypto/ElGamal.h"
 #include "util/Timestamp.h"
 #include "RouterContext.h"
 #include "NetDb.h"

Identity.cpp

@@ -4,8 +4,8 @@
 #include <cryptopp/osrng.h>
 #include <cryptopp/dsa.h>
 #include "util/base64.h"
-#include "CryptoConst.h"
-#include "ElGamal.h"
+#include "crypto/CryptoConst.h"
+#include "crypto/ElGamal.h"
 #include "RouterContext.h"
 #include "Identity.h"
 #include "I2PEndian.h"

Identity.h

@@ -6,8 +6,8 @@
 #include <string>
 #include <memory>
 #include "util/base64.h"
-#include "ElGamal.h"
-#include "Signature.h"
+#include "crypto/ElGamal.h"
+#include "crypto/Signature.h"
 
 namespace i2p
 {

LeaseSet.cpp

@@ -2,7 +2,7 @@
 #include "I2PEndian.h"
 #include <cryptopp/dsa.h>
 #include <cryptopp/osrng.h>
-#include "CryptoConst.h"
+#include "crypto/CryptoConst.h"
 #include "Log.h"
 #include "util/Timestamp.h"
 #include "NetDb.h"

Makefile

@@ -30,6 +30,7 @@ mk_build_dir:
 	mkdir -p obj
 	mkdir -p obj/transport
 	mkdir -p obj/util
+	mkdir -p obj/crypto
 mk_build_test_dir:
 	mkdir -p obj/tests
 
@@ -47,6 +48,7 @@ deps:
 	@mkdir -p obj/transport
 	@mkdir -p obj/tests
 	@mkdir -p obj/util
+	@mkdir -p obj/crypto
 	$(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) -MM *.cpp > $(DEPS)
 	@sed -i -e '/\.o:/ s/^/obj\//' $(DEPS)
 
@@ -55,6 +57,7 @@ obj/%.o : %.cpp
 	@mkdir -p obj/transport
 	@mkdir -p obj/tests
 	@mkdir -p obj/util
+	@mkdir -p obj/crypto
 	$(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) $(CPU_FLAGS) -c -o $@ $<
 
 # '-' is 'ignore if missing' on first run

Reseed.cpp

@@ -15,7 +15,7 @@
 #include "Reseed.h"
 #include "Log.h"
 #include "Identity.h"
-#include "CryptoConst.h"
+#include "crypto/CryptoConst.h"
 #include "NetDb.h"
 #include "util/util.h"
 

Reseed.h

@@ -9,7 +9,7 @@
 #include <cryptopp/rsa.h>
 #include <boost/asio.hpp>
 #include "Identity.h"
-#include "aes.h"
+#include "crypto/aes.h"
 
 namespace i2p
 {

RouterContext.cpp

@@ -2,7 +2,7 @@
 #include <cryptopp/dh.h>
 #include <cryptopp/dsa.h>
 #include <boost/lexical_cast.hpp>
-#include "CryptoConst.h"
+#include "crypto/CryptoConst.h"
 #include "RouterContext.h"
 #include "util/Timestamp.h"
 #include "I2NPProtocol.h"

RouterInfo.cpp

@@ -5,7 +5,7 @@
 #include <boost/lexical_cast.hpp>
 #include <cryptopp/sha.h>
 #include <cryptopp/dsa.h>
-#include "CryptoConst.h"
+#include "crypto/CryptoConst.h"
 #include "util/base64.h"
 #include "util/Timestamp.h"
 #include "Log.h"

TransitTunnel.h

@@ -5,7 +5,7 @@
 #include <vector>
 #include <mutex>
 #include <memory>
-#include "aes.h"
+#include "crypto/aes.h"
 #include "I2NPProtocol.h"
 #include "TunnelEndpoint.h"
 #include "TunnelGateway.h"

TunnelConfig.h

@@ -5,7 +5,7 @@
 #include <sstream>
 #include <vector>
 #include <memory>
-#include "aes.h"
+#include "crypto/aes.h"
 #include "RouterInfo.h"
 #include "RouterContext.h"
 #include "util/Timestamp.h"

TunnelPool.cpp

@@ -1,6 +1,6 @@
 #include <algorithm>
 #include "I2PEndian.h"
-#include "CryptoConst.h"
+#include "crypto/CryptoConst.h"
 #include "Tunnel.h"
 #include "NetDb.h"
 #include "util/Timestamp.h"

filelist.mk

@@ -2,11 +2,12 @@ COMMON_SRC = \
   transport/NTCPSession.cpp transport/SSU.cpp transport/SSUSession.cpp \
   transport/SSUData.cpp transport/Transports.cpp \
   util/util.cpp util/base64.cpp \
-  CryptoConst.cpp Datagram.cpp Garlic.cpp I2NPProtocol.cpp LeaseSet.cpp \
+  crypto/CryptoConst.cpp crypto/aes.cpp crypto/Signature.cpp \
+  Datagram.cpp Garlic.cpp I2NPProtocol.cpp LeaseSet.cpp \
   Log.cpp NetDb.cpp NetDbRequests.cpp Profiling.cpp Reseed.cpp \
-  RouterContext.cpp RouterInfo.cpp Signature.cpp Streaming.cpp Identity.cpp \
+  RouterContext.cpp RouterInfo.cpp Streaming.cpp Identity.cpp \
   TransitTunnel.cpp Tunnel.cpp TunnelEndpoint.cpp TunnelPool.cpp \
-  TunnelGateway.cpp Destination.cpp UPnP.cpp aes.cpp
+  TunnelGateway.cpp Destination.cpp UPnP.cpp
 
 
 ifeq ($(UNAME),Darwin)

transport/NTCPSession.cpp

@@ -6,7 +6,7 @@
 #include "util/base64.h"
 #include "Log.h"
 #include "util/Timestamp.h"
-#include "CryptoConst.h"
+#include "crypto/CryptoConst.h"
 #include "I2NPProtocol.h"
 #include "RouterContext.h"
 #include "Transports.h"

transport/NTCPSession.h

@@ -9,7 +9,7 @@
 #include <boost/asio.hpp>
 #include <cryptopp/modes.h>
 #include <cryptopp/aes.h>
-#include "aes.h"
+#include "crypto/aes.h"
 #include "Identity.h"
 #include "RouterInfo.h"
 #include "I2NPProtocol.h"

transport/SSU.h

@@ -9,7 +9,7 @@
 #include <thread>
 #include <mutex>
 #include <boost/asio.hpp>
-#include "aes.h"
+#include "crypto/aes.h"
 #include "I2PEndian.h"
 #include "Identity.h"
 #include "RouterInfo.h"

transport/SSUSession.cpp

@@ -1,7 +1,7 @@
 #include <boost/bind.hpp>
 #include <cryptopp/dh.h>
 #include <cryptopp/sha.h>
-#include "CryptoConst.h"
+#include "crypto/CryptoConst.h"
 #include "Log.h"
 #include "util/Timestamp.h"
 #include "RouterContext.h"

transport/SSUSession.h

@@ -4,8 +4,8 @@
 #include <inttypes.h>
 #include <set>
 #include <memory>
-#include "aes.h"
-#include "hmac.h"
+#include "crypto/aes.h"
+#include "crypto/hmac.h"
 #include "I2NPProtocol.h"
 #include "TransportSession.h"
 #include "SSUData.h"

transport/Transports.cpp

@@ -1,6 +1,6 @@
 #include <cryptopp/dh.h>
 #include "Log.h"
-#include "CryptoConst.h"
+#include "crypto/CryptoConst.h"
 #include "RouterContext.h"
 #include "I2NPProtocol.h"
 #include "NetDb.h"