From 9e866a1a2facc8cb1565cd660c6b6d482f18ecb1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Felix=20D=C3=B6rre?= Date: Tue, 6 Jan 2015 00:21:46 +0100 Subject: [PATCH] cln: Move code around, cleanup structure --- Makefile | 5 +++-- src/apps/client.cpp | 14 ++++++------- src/apps/signer.cpp | 16 +++++++-------- src/config.cpp | 2 +- src/{ => crypto}/X509.cpp | 0 src/{ => crypto}/X509.h | 4 ++-- src/{ => crypto}/remoteSigner.cpp | 0 src/{ => crypto}/remoteSigner.h | 10 +++++----- src/{ => crypto}/signer.h | 4 ++-- src/{ => crypto}/simpleOpensslSigner.cpp | 0 src/{ => crypto}/simpleOpensslSigner.h | 6 +++--- src/{ => crypto}/sslUtil.cpp | 0 src/{ => crypto}/sslUtil.h | 0 src/{ => db}/database.cpp | 0 src/{ => db}/database.h | 0 src/{ => db}/mysql.cpp | 0 src/{ => db}/mysql.h | 0 src/{ => io}/bios.cpp | 0 src/{ => io}/bios.h | 0 src/{ => io}/opensslBIO.cpp | 0 src/{ => io}/opensslBIO.h | 0 src/{ => io}/record.cpp | 0 src/{ => io}/record.h | 0 src/{ => io}/recordHandler.cpp | 25 ++++++++++-------------- src/{ => io}/recordHandler.h | 4 ++-- src/{ => io}/slipBio.cpp | 1 - src/{ => io}/slipBio.h | 0 src/util.cpp | 4 ++-- src/util.h | 6 +++--- test/Makefile | 2 +- test/src/X509Req.cpp | 5 ++--- test/src/bioWrapper.cpp | 9 +++++---- test/src/slipBioTest.cpp | 6 +++--- 33 files changed, 59 insertions(+), 64 deletions(-) rename src/{ => crypto}/X509.cpp (100%) rename src/{ => crypto}/X509.h (95%) rename src/{ => crypto}/remoteSigner.cpp (100%) rename src/{ => crypto}/remoteSigner.h (85%) rename src/{ => crypto}/signer.h (83%) rename src/{ => crypto}/simpleOpensslSigner.cpp (100%) rename src/{ => crypto}/simpleOpensslSigner.h (85%) rename src/{ => crypto}/sslUtil.cpp (100%) rename src/{ => crypto}/sslUtil.h (100%) rename src/{ => db}/database.cpp (100%) rename src/{ => db}/database.h (100%) rename src/{ => db}/mysql.cpp (100%) rename src/{ => db}/mysql.h (100%) rename src/{ => io}/bios.cpp (100%) rename src/{ => io}/bios.h (100%) rename src/{ => io}/opensslBIO.cpp (100%) rename src/{ => io}/opensslBIO.h (100%) rename src/{ => io}/record.cpp (100%) rename src/{ => io}/record.h (100%) rename src/{ => io}/recordHandler.cpp (95%) rename src/{ => io}/recordHandler.h (92%) rename src/{ => io}/slipBio.cpp (99%) rename src/{ => io}/slipBio.h (100%) diff --git a/Makefile b/Makefile index 50554a0..d39af3e 100644 --- a/Makefile +++ b/Makefile @@ -40,7 +40,8 @@ SRC_DIR=src OBJ_DIR=obj DEP_DIR=dep -FS_SRC=$(filter-out ${SRC_DIR}/mysql--disabled.cpp,$(wildcard ${SRC_DIR}/*.cpp)) +FS_SRC=$(wildcard ${SRC_DIR}/*.cpp) $(wildcard ${SRC_DIR}/io/*.cpp) $(wildcard ${SRC_DIR}/crypto/*.cpp) $(wildcard ${SRC_DIR}/db/*.cpp) + FS_BIN=$(wildcard ${SRC_DIR}/app/*.cpp) FS_LIBS=$(wildcard lib/*/) FS_OBJ=$(FS_SRC:${SRC_DIR}/%.cpp=${OBJ_DIR}/%.lo) @@ -103,7 +104,7 @@ bin/cassiopeia: libs ${FS_OBJ} ${OBJ_DIR}/apps/client.lo ${MKDIR} $(shell dirname $@) && ${LD} ${LDFLAGS} -lmysqlclient -o $@ ${FS_OBJ} ${OBJ_DIR}/apps/client.lo bin/cassiopeia-signer: libs ${FS_OBJ} ${OBJ_DIR}/apps/signer.lo - ${MKDIR} $(shell dirname $@) && ${LD} ${LDFLAGS} -o $@ $(filter-out ${OBJ_DIR}/mysql.lo,${FS_OBJ}) ${OBJ_DIR}/apps/signer.lo + ${MKDIR} $(shell dirname $@) && ${LD} ${LDFLAGS} -o $@ $(filter-out ${OBJ_DIR}/db/mysql.lo,${FS_OBJ}) ${OBJ_DIR}/apps/signer.lo ${DEP_DIR}/%.d: ${SRC_DIR}/%.cpp ${MKDIR} $(shell dirname $@) && $(CXX_DEP) $(CXXFLAGS) -M -MF $@ $< diff --git a/src/apps/client.cpp b/src/apps/client.cpp index 9e85c95..2f0480f 100644 --- a/src/apps/client.cpp +++ b/src/apps/client.cpp @@ -6,14 +6,14 @@ #include #include -#include "database.h" -#include "mysql.h" -#include "simpleOpensslSigner.h" +#include "db/database.h" +#include "db/mysql.h" +#include "crypto/simpleOpensslSigner.h" +#include "crypto/remoteSigner.h" +#include "crypto/sslUtil.h" #include "util.h" -#include "bios.h" -#include "slipBio.h" -#include "remoteSigner.h" -#include "sslUtil.h" +#include "io/bios.h" +#include "io/slipBio.h" #include "config.h" #ifdef NO_DAEMON diff --git a/src/apps/signer.cpp b/src/apps/signer.cpp index 6dddf02..dc9e702 100644 --- a/src/apps/signer.cpp +++ b/src/apps/signer.cpp @@ -2,16 +2,16 @@ #include #include -#include "database.h" -#include "mysql.h" -#include "simpleOpensslSigner.h" +#include "db/database.h" +#include "db/mysql.h" +#include "crypto/simpleOpensslSigner.h" +#include "crypto/remoteSigner.h" +#include "crypto/sslUtil.h" +#include "io/bios.h" +#include "io/slipBio.h" +#include "io/recordHandler.h" #include "util.h" -#include "bios.h" -#include "slipBio.h" -#include "remoteSigner.h" -#include "sslUtil.h" #include "config.h" -#include "recordHandler.h" #ifdef NO_DAEMON #define DAEMON false diff --git a/src/config.cpp b/src/config.cpp index 2eb1f49..a518db5 100644 --- a/src/config.cpp +++ b/src/config.cpp @@ -4,7 +4,7 @@ #include #include -#include "sslUtil.h" +#include "crypto/sslUtil.h" std::string keyDir; std::unordered_map profiles; diff --git a/src/X509.cpp b/src/crypto/X509.cpp similarity index 100% rename from src/X509.cpp rename to src/crypto/X509.cpp diff --git a/src/X509.h b/src/crypto/X509.h similarity index 95% rename from src/X509.h rename to src/crypto/X509.h index 79aabc1..0407999 100644 --- a/src/X509.h +++ b/src/crypto/X509.h @@ -5,8 +5,8 @@ #include -#include "database.h" -#include "sslUtil.h" +#include "db/database.h" +#include "crypto/sslUtil.h" class X509Req { private: diff --git a/src/remoteSigner.cpp b/src/crypto/remoteSigner.cpp similarity index 100% rename from src/remoteSigner.cpp rename to src/crypto/remoteSigner.cpp diff --git a/src/remoteSigner.h b/src/crypto/remoteSigner.h similarity index 85% rename from src/remoteSigner.h rename to src/crypto/remoteSigner.h index 333265c..09331bb 100644 --- a/src/remoteSigner.h +++ b/src/crypto/remoteSigner.h @@ -2,11 +2,11 @@ #include #include -#include "database.h" -#include "signer.h" -#include "bios.h" -#include "opensslBIO.h" -#include "record.h" +#include "db/database.h" +#include "crypto/signer.h" +#include "io/bios.h" +#include "io/opensslBIO.h" +#include "io/record.h" class RemoteSigner : public Signer { diff --git a/src/signer.h b/src/crypto/signer.h similarity index 83% rename from src/signer.h rename to src/crypto/signer.h index 0d67135..d9ab74e 100644 --- a/src/signer.h +++ b/src/crypto/signer.h @@ -2,8 +2,8 @@ #include -#include "database.h" -#include "sslUtil.h" +#include "db/database.h" +#include "crypto/sslUtil.h" class Signer { public: diff --git a/src/simpleOpensslSigner.cpp b/src/crypto/simpleOpensslSigner.cpp similarity index 100% rename from src/simpleOpensslSigner.cpp rename to src/crypto/simpleOpensslSigner.cpp diff --git a/src/simpleOpensslSigner.h b/src/crypto/simpleOpensslSigner.h similarity index 85% rename from src/simpleOpensslSigner.h rename to src/crypto/simpleOpensslSigner.h index f8e8729..11e95dd 100644 --- a/src/simpleOpensslSigner.h +++ b/src/crypto/simpleOpensslSigner.h @@ -2,9 +2,9 @@ #include -#include "database.h" -#include "sslUtil.h" -#include "signer.h" +#include "db/database.h" +#include "crypto/sslUtil.h" +#include "crypto/signer.h" class SimpleOpensslSigner : public Signer { private: diff --git a/src/sslUtil.cpp b/src/crypto/sslUtil.cpp similarity index 100% rename from src/sslUtil.cpp rename to src/crypto/sslUtil.cpp diff --git a/src/sslUtil.h b/src/crypto/sslUtil.h similarity index 100% rename from src/sslUtil.h rename to src/crypto/sslUtil.h diff --git a/src/database.cpp b/src/db/database.cpp similarity index 100% rename from src/database.cpp rename to src/db/database.cpp diff --git a/src/database.h b/src/db/database.h similarity index 100% rename from src/database.h rename to src/db/database.h diff --git a/src/mysql.cpp b/src/db/mysql.cpp similarity index 100% rename from src/mysql.cpp rename to src/db/mysql.cpp diff --git a/src/mysql.h b/src/db/mysql.h similarity index 100% rename from src/mysql.h rename to src/db/mysql.h diff --git a/src/bios.cpp b/src/io/bios.cpp similarity index 100% rename from src/bios.cpp rename to src/io/bios.cpp diff --git a/src/bios.h b/src/io/bios.h similarity index 100% rename from src/bios.h rename to src/io/bios.h diff --git a/src/opensslBIO.cpp b/src/io/opensslBIO.cpp similarity index 100% rename from src/opensslBIO.cpp rename to src/io/opensslBIO.cpp diff --git a/src/opensslBIO.h b/src/io/opensslBIO.h similarity index 100% rename from src/opensslBIO.h rename to src/io/opensslBIO.h diff --git a/src/record.cpp b/src/io/record.cpp similarity index 100% rename from src/record.cpp rename to src/io/record.cpp diff --git a/src/record.h b/src/io/record.h similarity index 100% rename from src/record.h rename to src/io/record.h diff --git a/src/recordHandler.cpp b/src/io/recordHandler.cpp similarity index 95% rename from src/recordHandler.cpp rename to src/io/recordHandler.cpp index ed45353..93990b0 100644 --- a/src/recordHandler.cpp +++ b/src/io/recordHandler.cpp @@ -1,11 +1,4 @@ -#include "recordHandler.h" - -#include -#include -#include -#include -#include -#include +#include "io/recordHandler.h" #include #include @@ -14,13 +7,15 @@ #include -#include "database.h" -#include "record.h" -#include "opensslBIO.h" -#include "remoteSigner.h" -#include "simpleOpensslSigner.h" -#include "sslUtil.h" -#include "slipBio.h" +#include "io/record.h" +#include "io/opensslBIO.h" +#include "io/slipBio.h" + +#include "db/database.h" +#include "crypto/remoteSigner.h" +#include "crypto/sslUtil.h" + +#include "crypto/simpleOpensslSigner.h" extern std::vector profiles; extern std::unordered_map> CAs; diff --git a/src/recordHandler.h b/src/io/recordHandler.h similarity index 92% rename from src/recordHandler.h rename to src/io/recordHandler.h index e9b1e20..be5a988 100644 --- a/src/recordHandler.h +++ b/src/io/recordHandler.h @@ -6,8 +6,8 @@ #include #include -#include "record.h" -#include "signer.h" +#include "crypto/signer.h" +#include "io/record.h" class RecordHandler { public: diff --git a/src/slipBio.cpp b/src/io/slipBio.cpp similarity index 99% rename from src/slipBio.cpp rename to src/io/slipBio.cpp index e1739ed..1a7ba04 100644 --- a/src/slipBio.cpp +++ b/src/io/slipBio.cpp @@ -232,6 +232,5 @@ bool SlipBIO::unmask() { decodePos = j; rawPos = j; decodeTarget = j; - return 0; } diff --git a/src/slipBio.h b/src/io/slipBio.h similarity index 100% rename from src/slipBio.h rename to src/io/slipBio.h diff --git a/src/util.cpp b/src/util.cpp index 36f2261..f04c4ae 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -4,7 +4,7 @@ #include -void writeFile( std::string name, std::string content ) { +void writeFile( const std::string& name, const std::string& content ) { std::ofstream file; file.open( name ); @@ -20,7 +20,7 @@ std::string readFile( const std::string& name ) { return res; } -std::string writeBackFile( std::string serial, std::string cert, std::string keydir ) { +std::string writeBackFile( const std::string& serial, const std::string& cert, const std::string& keydir ) { std::string filename = keydir; mkdir( filename.c_str(), 0755 ); filename += "/crt"; diff --git a/src/util.h b/src/util.h index 367d245..55bb578 100644 --- a/src/util.h +++ b/src/util.h @@ -2,7 +2,7 @@ #include -void writeFile( std::string name, std::string content ); -std::string readFile( std::string name ); +void writeFile( const std::string& name, const std::string& content ); +std::string readFile( const std::string& name ); -std::string writeBackFile( std::string serial, std::string cert, std::string keydir ); +std::string writeBackFile( const std::string& serial, const std::string& cert, const std::string& keydir ); diff --git a/test/Makefile b/test/Makefile index 803ba65..114e9ee 100644 --- a/test/Makefile +++ b/test/Makefile @@ -78,7 +78,7 @@ collissiondetect: cassiopeia-test: bin/cassiopeia-test bin/cassiopeia-test: libs ${FS_OBJ} - ${MKDIR} $(shell dirname $@) && ${LD} ${LDFLAGS} -o $@ ${FS_OBJ} $(filter-out %/main.o,$(wildcard ../obj/*.o)) + ${MKDIR} $(shell dirname $@) && ${LD} ${LDFLAGS} -o $@ ${FS_OBJ} $(filter-out ../obj/apps/%,$(wildcard ../obj/*.o) $(wildcard ../obj/*/*.o)) ${DEP_DIR}/%.d: ${SRC_DIR}/%.cpp ${MKDIR} $(shell dirname $@) && $(CXX_DEP) $(CXXFLAGS) -M -MF $@ $< diff --git a/test/src/X509Req.cpp b/test/src/X509Req.cpp index 750d7fc..f1dc3fc 100644 --- a/test/src/X509Req.cpp +++ b/test/src/X509Req.cpp @@ -1,12 +1,11 @@ -#include - #include #include -#include "X509.h" #include "util.h" +#include "crypto/X509.h" + BOOST_AUTO_TEST_SUITE( TestX509Req ) BOOST_AUTO_TEST_CASE( CSR ) { diff --git a/test/src/bioWrapper.cpp b/test/src/bioWrapper.cpp index a2706f8..aaf3ecc 100644 --- a/test/src/bioWrapper.cpp +++ b/test/src/bioWrapper.cpp @@ -1,9 +1,7 @@ -#include - #include -#include "bios.h" -#include "opensslBIO.h" +#include "io/bios.h" +#include "io/opensslBIO.h" class OpensslBIO1 : public OpensslBIO { public: @@ -21,17 +19,20 @@ int OpensslBIO1::write( const char* buf, int num ) { ( void ) buf; return 0; } + int OpensslBIO1::read( char* buf, int size ) { state = size * 3; ( void ) buf; return 0; } + long OpensslBIO1::ctrl( int cmod, long arg1, void* arg2 ) { state = cmod * 7; ( void ) arg1; ( void ) arg2; return 0; } + const char* OpensslBIO1::getName() { return "dummyBIO"; } diff --git a/test/src/slipBioTest.cpp b/test/src/slipBioTest.cpp index eef8fbb..d579eb3 100644 --- a/test/src/slipBioTest.cpp +++ b/test/src/slipBioTest.cpp @@ -6,9 +6,9 @@ #include #include -#include "bios.h" -#include "opensslBIO.h" -#include "slipBio.h" +#include "io/bios.h" +#include "io/opensslBIO.h" +#include "io/slipBio.h" class OpensslBIOVector : public OpensslBIO { private: -- 2.39.2