signature windows

likecutie · Sep 12, 2014 · 1922d8c · 1922d8c
1 parent f76392f
commit 1922d8c
Show file tree

Hide file tree

Showing 8 changed files with 342 additions and 106 deletions.
diff --git a/src/bootstrap/bootstrap_win.cpp b/src/bootstrap/bootstrap_win.cpp
diff --git a/src/bootstrap/win/CryptoHelper.cpp b/src/bootstrap/win/CryptoHelper.cpp
@@ -1,6 +1,6 @@
 #include "CryptoHelper.h"
 // The RSA public-key key exchange algorithm
-#define ENCRYPT_ALGORITHM         CALG_RSA_KEYX
+#define ENCRYPT_ALGORITHM         CALG_RSA_SIGN
 // The high order WORD 0x0200 (decimal 512)
 // determines the key length in bits.
 #define KEYLENGTH                 0x02000000
@@ -53,7 +53,7 @@ if (m_hCryptProv != NULL)
                                wszContainerName,
                                MS_ENHANCED_PROV,
                                PROV_RSA_FULL,
-    CRYPT_MACHINE_KEYSET))
+    0))
        {
          // An error occurred in acquiring the context. This could mean
          // that the key container requested does not exist. In this case,
@@ -64,7 +64,7 @@ if (m_hCryptProv != NULL)
                      if(!CryptAcquireContext(&m_hCryptProv,
                                             wszContainerName,
                                             MS_ENHANCED_PROV,   PROV_RSA_FULL,
-                                            CRYPT_MACHINE_KEYSET|CRYPT_NEWKEYSET))
+                                            CRYPT_NEWKEYSET))
                      {
                            dwErrCode = GetLastError();
                             return HRESULT_FROM_WIN32(dwErrCode);

diff --git a/src/library/base/logger.h b/src/library/base/logger.h
@@ -3,16 +3,20 @@
 
 #ifndef LOG_ENABLED
 #include <errno.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define clean_errno() (errno == 0 ? "None" : strerror(errno))
 
 #ifdef NDEBUG
 #define LOG_DEBUG(M, ...) _log("[INFO] %s (%s:%d) " M "\n", __FILE__, __LINE__, ##__VA_ARGS__)
 #else
 #define LOG_DEBUG(M,...)
 #endif
-#define LOG_INFO(M, ...) _log("[INFO] %s (%s:%d) " M "\n", __FILE__, __LINE__, ##__VA_ARGS__)
-#define LOG_WARN(M, ...) _log("[WARN] %s (%s:%d: errno: %s) " M "\n", __FILE__, __LINE__, clean_errno(), ##__VA_ARGS__)
-#define LOG_ERROR(M, ...) _log("[ERROR] %s (%s:%d: errno: %s) " M "\n", __FILE__, __LINE__, clean_errno(), ##__VA_ARGS__)
+#define LOG_INFO(M, ...) _log("[INFO] (%s:%d) " M "\n", __FILE__, __LINE__, ##__VA_ARGS__)
+#define LOG_WARN(M, ...) _log("[WARN] (%s:%d: errno: %s) " M "\n", __FILE__, __LINE__, clean_errno(), ##__VA_ARGS__)
+#define LOG_ERROR(M, ...) _log("[ERROR] (%s:%d: errno: %s) " M "\n", __FILE__, __LINE__, clean_errno(), ##__VA_ARGS__)
 
 #else
 #define LOG_DEBUG(M,...)
@@ -23,4 +27,8 @@
 
 void _log(char* format, ...);
 void _shutdown_log();
+
+#ifdef __cplusplus
+}
+#endif
 #endif
diff --git a/src/library/os/win/os-win.c b/src/library/os/win/os-win.c
@@ -1,6 +1,6 @@
 #include <Windows.h>
 #include <iphlpapi.h>
-//definition of size_t
+//definition of size_t
 #include <stdlib.h>
 #include "../../base/logger.h"
 #include"../os.h"

diff --git a/src/license-generator/LicenseSigner.h b/src/license-generator/LicenseSigner.h
@@ -13,7 +13,12 @@
 namespace license {
 
 class LicenseSigner {
+#ifdef __unix__
 	const string privateKey;
+#else
+	HCRYPTPROV hProv;
+	HCRYPTKEY hPubKey;
+#endif
 	string signString(const string& license);
 	string Opensslb64Encode(size_t slen, unsigned char* signature);
 

diff --git a/src/license-generator/license-generator.cpp b/src/license-generator/license-generator.cpp
@@ -81,7 +81,7 @@ vector<FullLicenseInfo> LicenseGenerator::parseLicenseInfo(
 			time_t curtime = time(NULL);
 			strftime(curdate, 20, "%Y-%m-%d", localtime(&curtime));
 			begin_date.assign(curdate);
-		} catch (invalid_argument &e) {
+		} catch (const invalid_argument &e) {
 			cerr << endl << "End date not recognized: " << dt_end
 					<< " Please enter a valid date in format YYYYMMDD" << endl;
 			exit(2);
@@ -189,29 +189,24 @@ int LicenseGenerator::generateLicense(int argc, const char **argv) {
 }
 
 
-const std::locale formats[] = { std::locale(std::locale::classic(),
-		new bt::time_input_facet("%Y-%m-%d")), //
-std::locale(std::locale::classic(), new bt::time_input_facet("%Y/%m/%d")), //
-std::locale(std::locale::classic(), new bt::time_input_facet("%Y%m%d")) };
-const size_t formats_n = sizeof(formats) / sizeof(formats[0]);
-
-string LicenseGenerator::normalize_date(const std::string& s) {
-	bt::ptime pt;
-	for (size_t i = 0; i < formats_n; ++i) {
-		std::istringstream is(s);
-		is.imbue(formats[i]);
-		is >> pt;
-		if (pt != bt::ptime()) {
-			break;
+const std::string formats[] = { "%4u-%2u-%2u","%4u/%2u/%2u","%4u%2u%2u" };
+const size_t formats_n = 3;
+
+string LicenseGenerator::normalize_date(const char * s) {
+	unsigned int year, month, day;
+	int chread;
+	bool found = false;
+	for (size_t i = 0; i < formats_n &&!found; ++i) {
+		chread = sscanf(s, formats[i].c_str(),&year, &month, &day);
+		if (chread == 3){
+			found = true;
 		}
 	}
-	if (pt == bt::ptime()) {
-		throw invalid_argument(string("Date not regognized") + s);
+	if (!found){
+		throw invalid_argument("Date not recognized.");
 	}
 	ostringstream oss;
-	bt::time_facet *facet = new bt::time_facet("%Y-%m-%d");
-	oss.imbue(locale(cout.getloc(), facet));
-	oss << pt;
+	oss << year << "-"<<setfill('0') << std::setw(2)<< month<<"-"<<day;
 	//delete (facet);
 	return oss.str();
 }

diff --git a/src/license-generator/license-generator.h b/src/license-generator/license-generator.h
@@ -26,7 +26,7 @@ class LicenseGenerator {
 	static vector<FullLicenseInfo> parseLicenseInfo(po::variables_map vm);
 	static void generateAndOutputLicenses(const po::variables_map& vm,
 			ostream& outputFile);
-	static string normalize_date(const std::string& s);
+	static string normalize_date(const char * s);
 public:
 	static int generateLicense(int argc, const char** argv);
 };