moving files for refactoring

CMakeLists.txt

@@ -12,7 +12,6 @@ SET(LICENSECC_INT_VERSION "${LICENSECC_MAJOR_VERSION}${LICENSECC_MINOR_VERSION}$
 SET(LICENSECC_VERSION "${LICENSECC_MAJOR_VERSION}.${LICENSECC_MINOR_VERSION}.${LICENSECC_PATCH_VERSION}")
 SET(LICENSECC_SHORT_LICENSE "BSD Software License")
 
-# add this options before PROJECT keyword
 SET(CMAKE_DISABLE_SOURCE_CHANGES OFF)
 SET(CMAKE_DISABLE_IN_SOURCE_BUILD ON)
 SET(CMAKE_VERBOSE_MAKEFILE ON CACHE BOOL "CMake verbose" FORCE)

src/CMakeLists.txt

@@ -1,6 +1,4 @@
-add_subdirectory("bootstrap")
 add_subdirectory("library")
-add_subdirectory("pc-identifier")
-add_subdirectory("license-generator")
+add_subdirectory("tools")
 
 

src/library/LicenseReader.cpp

@@ -2,7 +2,7 @@
  * LicenseReader.cpp
  *
  *  Created on: Mar 30, 2014
- *      Author: devel
+ *      
  */
 
 #ifdef _WIN32

src/library/LicenseReader.h

@@ -2,7 +2,7 @@
  * LicenseReader.h
  *
  *  Created on: Mar 30, 2014
- *      Author: devel
+ *      
  */
 
 #ifndef LICENSEREADER_H_

src/library/base/EventRegistry.cpp

@@ -2,7 +2,7 @@
  * EventRegistry.cpp
  *
  *  Created on: Mar 30, 2014
- *      Author: devel
+ *      
  */
 
 #include "EventRegistry.h"

src/library/base/EventRegistry.h

@@ -2,7 +2,7 @@
  * EventRegistry.h
  *
  *  Created on: Mar 30, 2014
- *      Author: devel
+ *      
  */
 
 #ifndef EVENTREGISTRY_H_

src/library/base/StringUtils.cpp

@@ -2,7 +2,7 @@
  * StringUtils.cpp
  *
  *  Created on: Apr 8, 2014
- *      Author: devel
+ *      
  */
 
 #include <cctype> //toupper

src/library/base/StringUtils.h

@@ -2,7 +2,7 @@
  * StringUtils.h
  *
  *  Created on: Apr 8, 2014
- *      Author: devel
+ *      
  */
 
 #ifndef STRINGUTILS_H_

src/library/os/linux/os-linux.c

@@ -48,7 +48,7 @@ static int ifname_position(char *ifnames, char * ifname, int ifnames_max) {
 
 }
 
-FUNCTION_RETURN getAdapterInfos(AdapterInfo * adapterInfos,
+FUNCTION_RETURN getAdapterInfos(OsAdapterInfo * adapterInfos,
 		size_t * adapter_info_size) {
 
 	FUNCTION_RETURN f_return = FUNC_RET_OK;
@@ -64,7 +64,7 @@ FUNCTION_RETURN getAdapterInfos(AdapterInfo * adapterInfos,
 	}
 
 	if (adapterInfos != NULL) {
-		memset(adapterInfos, 0, (*adapter_info_size) * sizeof(AdapterInfo));
+		memset(adapterInfos, 0, (*adapter_info_size) * sizeof(OsAdapterInfo));
 	}
 
 	/* count the maximum number of interfaces */

src/library/os/os-cpp.h

@@ -2,7 +2,7 @@
  * os-dependent.hpp
  *
  *  Created on: Mar 29, 2014
- *      Author: devel
+ *      
  */
 
 #ifndef OS_DEPENDENT_CPP_

src/library/os/os.h

@@ -2,7 +2,7 @@
  * os-dependent.hpp
  *
  *  Created on: Mar 29, 2014
- *      Author: devel
+ *      
  */
 
 #ifndef OS_DEPENDENT_HPP_

src/library/pc-identifiers.c

@@ -2,7 +2,7 @@
  * pc-identifiers.c
  *
  *  Created on: Apr 16, 2014
- *      Author: devel
+ *      
  */
 
 #include "os/os.h"

src/library/pc-identifiers.h

@@ -2,7 +2,7 @@
  * pc-identifiers.h
  *
  *  Created on: Apr 16, 2014
- *      Author: devel
+ *      
  */
 
 #ifndef PC_IDENTIFIERS_H_

src/tools/CMakeLists.txt

@@ -0,0 +1,7 @@
+enable_language(CXX)
+add_subdirectory("base_lib")
+add_subdirectory("bootstrap")
+add_subdirectory("pc-identifier")
+add_subdirectory("license-generator")
+
+

src/tools/base_lib/CMakeLists.txt

@@ -0,0 +1,19 @@
+
+if(WIN32)
+ADD_LIBRARY(
+    tools_base STATIC
+    CryptoHelper.cpp
+    win/CryptoHelperWindows.cpp
+)
+else(WIN32)
+ADD_LIBRARY(
+    tools_base STATIC
+    CryptoHelper.cpp
+    linux/CryptoHelperLinux.cpp
+)
+ENDIF(WIN32)
+
+target_link_libraries(
+     tools_base
+     ${EXTERNAL_LIBS}
+)

src/tools/base_lib/CryptoHelper.cpp

@@ -0,0 +1,20 @@
+#include <memory>
+#include "CryptoHelper.h"
+#ifdef __unix__
+#include"linux/CryptoHelperLinux.h"
+#else
+#include"win/CryptoHelperWindows.h"
+#endif
+
+using namespace std;
+namespace license {
+
+unique_ptr<CryptoHelper> CryptoHelper::getInstance() {
+#ifdef __unix__
+	unique_ptr<CryptoHelper> ptr((CryptoHelper*) new CryptoHelperLinux());
+#else
+	unique_ptr<CryptoHelper> ptr((CryptoHelper*) new CryptpHelperWindows());
+#endif
+	return ptr;
+}
+}

src/tools/base_lib/CryptoHelper.h

@@ -0,0 +1,36 @@
+#ifndef CRYPTPHELPER_H_
+#define CRYPTPHELPER_H_
+
+#include <memory>
+#include <cstddef>
+
+namespace license {
+using namespace std;
+/**
+ * Helper class definition to generate and export Public/Private keys
+ * for Asymmetric encryption.
+ *
+ * <p>Since this part relies heavily on operating system libraries this class
+ * provides a common facade to the cryptographic functions. The two implementing
+ * subclasses are chosen in the factory method #getInstance(). This is to avoid
+ * to clutter the code with many "ifdef". (extreme performance is not an issue here)</p>
+ *<p> *it is shared by bootstrap and license-generator projects.</p>
+ */
+
+class CryptoHelper {
+
+protected:
+	CryptoHelper();
+
+public:
+	virtual void generateKeyPair() = 0;
+	virtual const string exportPrivateKey() const = 0;
+	virtual const string exportPublicKey() const = 0;
+
+	virtual const string signString(const unsigned char* privateKey,
+			size_t pklen, const string& license) const = 0;
+	static unique_ptr<CryptoHelper> getInstance();
+	virtual ~CryptoHelper();
+};
+}
+#endif

src/tools/base_lib/README.TXT

@@ -0,0 +1,3 @@
+This is the base library for the tools projects.
+It contains cryptographic functions (that are very different from Linux and 
+Windows operating systems)