From d35591346c48606697898338c1c01a3d52c520eb Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周三, 01 1月 2020 20:23:54 +0800
Subject: [PATCH] update build system and cleanup
---
test/library/CMakeLists.txt | 18 +-
src/library/CMakeLists.txt | 13 +
src/library/base/base64.h | 47 +------
src/library/os/windows/.gitignore | 1
test/functional/CMakeLists.txt | 36 +++---
src/library/locate/CMakeLists.txt | 17 +-
src/library/os/CMakeLists.txt | 22 ++-
src/library/base/base64.cpp | 160 +++++++++++++++-----------
src/library/base/CMakeLists.txt | 10 -
9 files changed, 161 insertions(+), 163 deletions(-)
diff --git a/src/library/CMakeLists.txt b/src/library/CMakeLists.txt
index a9f75d8..ffa4a76 100644
--- a/src/library/CMakeLists.txt
+++ b/src/library/CMakeLists.txt
@@ -1,24 +1,27 @@
add_subdirectory("base")
+add_subdirectory("os")
+add_subdirectory("locate")
+add_subdirectory("pc_identifier")
ADD_LIBRARY(licensecc_static STATIC
licensecc.cpp
LicenseReader.cpp
- pc-identifiers.c
limits/license_verifier.cpp
ini/ConvertUTF.c
+ $<TARGET_OBJECTS:locate>
+ $<TARGET_OBJECTS:os>
+ $<TARGET_OBJECTS:base>
)
-add_subdirectory("locate")
-add_subdirectory("os")
define_property(TARGET PROPERTY WITH_OPENSSL BRIEF_DOCS "need openssl to compile" FULL_DOCS "ff")
IF(UNIX OR OPENSSL_FOUND)
target_compile_definitions(licensecc_static PUBLIC HAS_OPENSSL)
set_target_properties(licensecc_static PROPERTIES WITH_OPENSSL 1)
- target_link_libraries(licensecc_static PUBLIC base OpenSSL::Crypto ${EXTERNAL_LIBS} ${CMAKE_DL_LIBS})
+ target_link_libraries(licensecc_static PUBLIC OpenSSL::Crypto ${EXTERNAL_LIBS} ${CMAKE_DL_LIBS})
ELSE(UNIX OR OPENSSL_FOUND)
set_target_properties(licensecc_static PROPERTIES WITH_OPENSSL 0)
- target_link_libraries(licensecc_static PUBLIC base ${EXTERNAL_LIBS})
+ target_link_libraries(licensecc_static PUBLIC ${EXTERNAL_LIBS})
ENDIF(UNIX OR OPENSSL_FOUND)
target_include_directories(licensecc_static
diff --git a/src/library/base/CMakeLists.txt b/src/library/base/CMakeLists.txt
index 3582cae..5bed712 100644
--- a/src/library/base/CMakeLists.txt
+++ b/src/library/base/CMakeLists.txt
@@ -1,10 +1,12 @@
-ADD_LIBRARY(base STATIC
+ADD_LIBRARY(base OBJECT
EventRegistry.cpp
StringUtils.cpp
FileUtils.cpp
+ base64.cpp
logger.c
- base64.c
)
+
+add_dependencies( base project_initialize )
if(CODE_COVERAGE AND UNIX)
MESSAGE(STATUS "Enabling code coverage")
@@ -13,10 +15,6 @@
-g # generate debug info
--coverage # sets all required flags
)
- target_link_libraries(base PUBLIC gcov)
endif(CODE_COVERAGE AND UNIX)
-add_dependencies( base project_initialize )
-
-install(TARGETS base EXPORT licensecc ARCHIVE DESTINATION lib/${PROJECT_NAME}/${LCC_PROJECT_NAME})
diff --git a/src/library/base/base64.cpp b/src/library/base/base64.cpp
index 1e1ea5b..af66658 100644
--- a/src/library/base/base64.cpp
+++ b/src/library/base/base64.cpp
@@ -1,107 +1,127 @@
#include <stdio.h>
#include <stdlib.h>
-const static char* b64 =
- "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+#include "base64.h"
+namespace license {
+using namespace std;
+
+const static char* b64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
// maps A=>0,B=>1..
-const static unsigned char unb64[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //10
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //20
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //30
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //40
- 0, 0, 0, 62, 0, 0, 0, 63, 52, 53, //50
- 54, 55, 56, 57, 58, 59, 60, 61, 0, 0, //60
- 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, //70
- 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, //80
- 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, //90
- 25, 0, 0, 0, 0, 0, 0, 26, 27, 28, //100
- 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, //110
- 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, //120
- 49, 50, 51, 0, 0, 0, 0, 0, 0, 0, //130
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //140
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //150
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //160
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //170
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //180
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //190
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //200
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //210
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //220
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //230
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //240
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //250
- 0, 0, 0, 0, 0, 0, }; // This array has 255 elements
+const static unsigned char unb64[] = {
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 10
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 20
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 30
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 40
+ 0, 0, 0, 62, 0, 0, 0, 63, 52, 53, // 50
+ 54, 55, 56, 57, 58, 59, 60, 61, 0, 0, // 60
+ 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, // 70
+ 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, // 80
+ 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, // 90
+ 25, 0, 0, 0, 0, 0, 0, 26, 27, 28, // 100
+ 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, // 110
+ 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, // 120
+ 49, 50, 51, 0, 0, 0, 0, 0, 0, 0, // 130
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 140
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 150
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 160
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 170
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 180
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 190
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 200
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 210
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 220
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 230
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 240
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 250
+ 0, 0, 0, 0, 0, 0,
+}; // This array has 255 elements
-//review api
-char* base64(const void* binaryData, int len, int *flen) {
- const unsigned char* bin = (const unsigned char*) binaryData;
- char* res;
+// review api
+void add_CR_if_needed(string& encodeBuffer, int lineLenght) {
+ if (lineLenght > 0 && ((encodeBuffer.size() + 1) % lineLenght) == 0) {
+ encodeBuffer += '\n';
+ }
+}
- int rc = 0; // result counter
- int byteNo; // I need this after the loop
+string base64(const void* binaryData, size_t len, int lineLenght) {
+ const unsigned char* bin = (const unsigned char*)binaryData;
+
+ int rc = 0; // result counter
+ int byteNo; // I need this after the loop
int modulusLen = len % 3;
- int pad = ((modulusLen & 1) << 1) + ((modulusLen & 2) >> 1); // 2 gives 1 and 1 gives 2, but 0 gives 0.
+ int pad = ((modulusLen & 1) << 1) + ((modulusLen & 2) >> 1); // 2 gives 1 and 1 gives 2, but 0 gives 0.
- *flen = 4 * (len + pad) / 3;
- res = (char*) malloc(*flen + 1); // and one for the null
- if (!res) {
- puts("ERROR: base64 could not allocate enough memory.");
- puts("I must stop because I could not get enough");
- return 0;
+ const size_t flen = 4 * (len + pad) / 3;
+ size_t totalLength = flen;
+ if (lineLenght > 0) {
+ totalLength += ((int)flen / lineLenght) + 3;
}
+
+ string encodeBuffer;
+ encodeBuffer.reserve(totalLength);
for (byteNo = 0; byteNo <= len - 3; byteNo += 3) {
unsigned char BYTE0 = bin[byteNo];
unsigned char BYTE1 = bin[byteNo + 1];
unsigned char BYTE2 = bin[byteNo + 2];
- res[rc++] = b64[BYTE0 >> 2];
- res[rc++] = b64[((0x3 & BYTE0) << 4) + (BYTE1 >> 4)];
- res[rc++] = b64[((0x0f & BYTE1) << 2) + (BYTE2 >> 6)];
- res[rc++] = b64[0x3f & BYTE2];
+
+ add_CR_if_needed(encodeBuffer, lineLenght);
+ encodeBuffer += b64[BYTE0 >> 2];
+ add_CR_if_needed(encodeBuffer, lineLenght);
+ encodeBuffer += b64[((0x3 & BYTE0) << 4) + (BYTE1 >> 4)];
+ add_CR_if_needed(encodeBuffer, lineLenght);
+ encodeBuffer += b64[((0x0f & BYTE1) << 2) + (BYTE2 >> 6)];
+ add_CR_if_needed(encodeBuffer, lineLenght);
+ encodeBuffer += b64[0x3f & BYTE2];
}
if (pad == 2) {
- res[rc++] = b64[bin[byteNo] >> 2];
- res[rc++] = b64[(0x3 & bin[byteNo]) << 4];
- res[rc++] = '=';
- res[rc++] = '=';
+ add_CR_if_needed(encodeBuffer, lineLenght);
+ encodeBuffer += b64[bin[byteNo] >> 2];
+ add_CR_if_needed(encodeBuffer, lineLenght);
+ encodeBuffer += b64[(0x3 & bin[byteNo]) << 4];
+ add_CR_if_needed(encodeBuffer, lineLenght);
+ encodeBuffer += '=';
+ add_CR_if_needed(encodeBuffer, lineLenght);
+ encodeBuffer += '=';
} else if (pad == 1) {
- res[rc++] = b64[bin[byteNo] >> 2];
- res[rc++] = b64[((0x3 & bin[byteNo]) << 4) + (bin[byteNo + 1] >> 4)];
- res[rc++] = b64[(0x0f & bin[byteNo + 1]) << 2];
- res[rc++] = '=';
+ add_CR_if_needed(encodeBuffer, lineLenght);
+ encodeBuffer += b64[bin[byteNo] >> 2];
+ add_CR_if_needed(encodeBuffer, lineLenght);
+ encodeBuffer += b64[((0x3 & bin[byteNo]) << 4) + (bin[byteNo + 1] >> 4)];
+ add_CR_if_needed(encodeBuffer, lineLenght);
+ encodeBuffer += b64[(0x0f & bin[byteNo + 1]) << 2];
+ add_CR_if_needed(encodeBuffer, lineLenght);
+ encodeBuffer += '=';
}
-
- res[rc] = 0; // NULL TERMINATOR! ;)
- return res;
+ if (lineLenght && encodeBuffer[encodeBuffer.length() - 1] != '\n') {
+ encodeBuffer += '\n';
+ }
+ return encodeBuffer;
}
-//FIXME!
-unsigned char* unbase64(const char* ascii, int len, int *flen) {
- const unsigned char *safeAsciiPtr = (const unsigned char*) ascii;
- unsigned char *bin;
+unsigned char* unbase64(const char* ascii, int len, int* flen) {
+ const unsigned char* safeAsciiPtr = (const unsigned char*)ascii;
+ unsigned char* bin;
int cb = 0;
int charNo;
int pad = 0;
- if (len < 2) { // 2 accesses below would be OOB.
+ if (len < 2) { // 2 accesses below would be OOB.
// catch empty string, return NULL as result.
- puts(
- "ERROR: You passed an invalid base64 string (too short). You get NULL back.");
+ puts("ERROR: You passed an invalid base64 string (too short). You get NULL back.");
*flen = 0;
return 0;
}
- if (safeAsciiPtr[len - 1] == '=')
- ++pad;
- if (safeAsciiPtr[len - 2] == '=')
- ++pad;
+ if (safeAsciiPtr[len - 1] == '=') ++pad;
+ if (safeAsciiPtr[len - 2] == '=') ++pad;
*flen = 3 * len / 4 - pad;
- bin = (unsigned char*) malloc(*flen);
+ bin = (unsigned char*)malloc(*flen);
if (!bin) {
puts("ERROR: unbase64 could not allocate enough memory.");
- puts("I must stop because I could not get enough");
return 0;
}
@@ -132,3 +152,5 @@
return bin;
}
+
+} // namespace license
diff --git a/src/library/base/base64.h b/src/library/base/base64.h
index 9a353df..f64c4cd 100644
--- a/src/library/base/base64.h
+++ b/src/library/base/base64.h
@@ -1,44 +1,17 @@
-/*
-
- https://github.com/superwills/NibbleAndAHalf
- base64.h -- Fast base64 encoding and decoding.
- version 1.0.0, April 17, 2013 143a
-
- Copyright (C) 2013 William Sherif
-
- This software is provided 'as-is', without any express or implied
- warranty. In no event will the authors be held liable for any damages
- arising from the use of this software.
-
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
-
- 1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software
- in a product, an acknowledgment in the product documentation would be
- appreciated but is not required.
- 2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
- 3. This notice may not be removed or altered from any source distribution.
-
- William Sherif
- will.sherif@gmail.com
-
- YWxsIHlvdXIgYmFzZSBhcmUgYmVsb25nIHRvIHVz
-
- */
#ifndef BASE64_H
#define BASE64_H
-#ifdef __cplusplus
-extern "C" {
+#include <string>
+
+#if _WIN32
+#include <wtypes.h>
#endif
-unsigned char* unbase64(const char* ascii, int len, int *flen);
-char* base64(const void* binaryData, int len, int *flen);
+namespace license {
-#ifdef __cplusplus
-}
-#endif
+unsigned char* unbase64(const char* ascii, int len, int* flen);
+std::string base64(const void* binaryData, size_t len, int lineLenght = -1);
+
+} // namespace license
+
#endif
diff --git a/src/library/locate/CMakeLists.txt b/src/library/locate/CMakeLists.txt
index 4382448..0862d6c 100644
--- a/src/library/locate/CMakeLists.txt
+++ b/src/library/locate/CMakeLists.txt
@@ -1,9 +1,12 @@
-target_sources(licensecc_static PRIVATE
- ${CMAKE_CURRENT_SOURCE_DIR}/ApplicationFolder.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/EnvironmentVarLocation.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/EnvironmentVarData.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/ExternalDefinition.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/LocatorStrategy.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/LocatorFactory.cpp
+add_library(locate OBJECT
+ ApplicationFolder.cpp
+ EnvironmentVarLocation.cpp
+ EnvironmentVarData.cpp
+ ExternalDefinition.cpp
+ LocatorStrategy.cpp
+ LocatorFactory.cpp
)
+if(CODE_COVERAGE AND UNIX)
+ target_compile_options(locate PUBLIC -O0 -g --coverage)
+endif(CODE_COVERAGE AND UNIX)
\ No newline at end of file
diff --git a/src/library/os/CMakeLists.txt b/src/library/os/CMakeLists.txt
index e9e74df..8d95071 100644
--- a/src/library/os/CMakeLists.txt
+++ b/src/library/os/CMakeLists.txt
@@ -1,17 +1,19 @@
IF(UNIX OR OPENSSL_FOUND)
IF(UNIX)
- target_sources(licensecc_static PRIVATE
- ${CMAKE_CURRENT_SOURCE_DIR}/openssl/signature_verifier.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/os-linux.c
- ${CMAKE_CURRENT_SOURCE_DIR}/network_id.c)
+ add_library(os OBJECT
+ openssl/signature_verifier.cpp
+ linux/execution_environment.cpp
+ linux/cpu_info.cpp
+ linux/os-linux.c
+ linux/network_id.c)
ELSE(UNIX)
- target_sources(licensecc_static PRIVATE
- ${CMAKE_CURRENT_SOURCE_DIR}/openssl/signature_verifier.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/os-win.c)
+ add_library(os OBJECT openssl/signature_verifier.cpp windows/os-win.c)
ENDIF(UNIX)
ELSE(UNIX OR OPENSSL_FOUND)
- target_sources(licensecc_static PRIVATE
- ${CMAKE_CURRENT_SOURCE_DIR}/windows/signature_verifier.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/os-win.c)
+ target_sources(os OBJECT windows/signature_verifier.cpp windows/os-win.c)
ENDIF(UNIX OR OPENSSL_FOUND)
+if(CODE_COVERAGE AND UNIX)
+ MESSAGE(STATUS "Enabling code coverage")
+ target_compile_options(os PUBLIC -O0 -g --coverage)
+endif(CODE_COVERAGE AND UNIX)
\ No newline at end of file
diff --git a/src/library/os/windows/.gitignore b/src/library/os/windows/.gitignore
new file mode 100644
index 0000000..f3d0437
--- /dev/null
+++ b/src/library/os/windows/.gitignore
@@ -0,0 +1 @@
+/isvm/
diff --git a/test/functional/CMakeLists.txt b/test/functional/CMakeLists.txt
index 60c676e..71cf989 100644
--- a/test/functional/CMakeLists.txt
+++ b/test/functional/CMakeLists.txt
@@ -2,20 +2,17 @@
generate-license.cpp
)
-target_link_libraries(
- license_generator_snippet
+target_link_libraries( license_generator_snippet
Boost::unit_test_framework
Boost::filesystem
Boost::system
)
-add_executable(
- test_standard_license
+add_executable( test_standard_license
standard-license_test.cpp
)
-target_link_libraries(
- test_standard_license
+target_link_libraries( test_standard_license
licensecc_static
license_generator_snippet
Boost::unit_test_framework
@@ -23,13 +20,11 @@
Boost::system
)
-add_executable(
- test_date
+add_executable( test_date
date_test.cpp
)
-target_link_libraries(
- test_date
+target_link_libraries( test_date
licensecc_static
license_generator_snippet
Boost::unit_test_framework
@@ -37,8 +32,7 @@
Boost::system
)
-add_executable(
- test_signature_verifier
+add_executable( test_signature_verifier
signature_verifier_test.cpp
)
@@ -52,13 +46,9 @@
)
-add_executable(
- test_volid
- volid_test.cpp
-)
+add_executable(test_volid volid_test.cpp)
-target_link_libraries(
- test_volid
+target_link_libraries( test_volid
licensecc_static
license_generator_snippet
Boost::unit_test_framework
@@ -66,7 +56,17 @@
Boost::system
)
+add_executable(test_crack crack_test.cpp)
+target_link_libraries( test_crack
+ licensecc_static
+ license_generator_snippet
+ Boost::unit_test_framework
+ Boost::filesystem
+ Boost::system
+)
+
+ADD_TEST(NAME test_crack COMMAND test_crack WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
ADD_TEST(NAME test_date COMMAND test_date WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
ADD_TEST(NAME test_standard_license COMMAND test_standard_license WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
ADD_TEST(NAME test_signature_verifier COMMAND test_signature_verifier WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
diff --git a/test/library/CMakeLists.txt b/test/library/CMakeLists.txt
index c04985d..056ed89 100644
--- a/test/library/CMakeLists.txt
+++ b/test/library/CMakeLists.txt
@@ -1,17 +1,13 @@
-add_executable(
- test_license_reader
+add_executable( test_license_reader
LicenseReader_test.cpp
)
-target_link_libraries(
- test_license_reader
+target_link_libraries( test_license_reader
licensecc_static
Boost::unit_test_framework
Boost::filesystem
Boost::system
)
-
-ADD_TEST(NAME test_license_reader COMMAND test_license_reader)
IF(WIN32)
#test windows
@@ -34,8 +30,8 @@
### LicenseLocator tests
add_executable(
- test_license_locator
- LicenseLocator_test.cpp
+ test_license_locator
+ LicenseLocator_test.cpp
)
target_link_libraries(
@@ -46,8 +42,6 @@
Boost::system
)
-ADD_TEST(NAME test_license_locator COMMAND test_license_locator)
-
### LicenseLocator tests
add_executable(
test_event_registry
@@ -56,10 +50,12 @@
target_link_libraries(
test_event_registry
- base
+ licensecc_static
Boost::unit_test_framework
Boost::filesystem
Boost::system
)
+ADD_TEST(NAME test_license_reader COMMAND test_license_reader)
+ADD_TEST(NAME test_license_locator COMMAND test_license_locator)
ADD_TEST(NAME test_event_registry COMMAND test_event_registry)
--
Gitblit v1.9.1