From 8c14cb84c5f4a38dc7873d6a254bcb8c33f8a603 Mon Sep 17 00:00:00 2001
From: open-license-manager <rillf@maildrop.cc>
Date: 周一, 28 7月 2014 05:54:43 +0800
Subject: [PATCH] test volid
---
src/library/LicenseReader.cpp | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/src/library/LicenseReader.cpp b/src/library/LicenseReader.cpp
index 6e1c064..05762c4 100644
--- a/src/library/LicenseReader.cpp
+++ b/src/library/LicenseReader.cpp
@@ -18,12 +18,13 @@
#include <fstream>
#include <sstream>
#include <stdlib.h>
+#include "pc-identifiers.h"
#include "LicenseReader.h"
#include "base/StringUtils.h"
#include "base/public-key.h"
#include <build_properties.h>
-#include "os/os.hpp"
+#include "os/os-cpp.h"
namespace license {
@@ -47,7 +48,7 @@
EventRegistry FullLicenseInfo::validate(int sw_version) {
EventRegistry er;
- OsFunctions::initialize();
+ os_initialize();
bool sigVerified = OsFunctions::verifySignature(printForSign().c_str(),
license_signature.c_str());
if (sigVerified) {
@@ -62,6 +63,14 @@
}
if (valid_from() > now) {
er.addEvent(PRODUCT_EXPIRED, SEVERITY_ERROR);
+ }
+ }
+ if (has_client_sig) {
+ PcSignature str_code;
+ strncpy(str_code, client_signature.c_str(), sizeof(str_code));
+ EVENT_TYPE event = validate_pc_signature(str_code);
+ if (event != LICENSE_OK) {
+ er.addEvent(event, SEVERITY_ERROR);
}
}
return er;
@@ -123,7 +132,7 @@
* sw_version_to = (optional int)
* from_date = YYYY-MM-DD (optional)
* to_date = YYYY-MM-DD (optional)
- * client_signature = XXXXXXXX (optional string 16)
+ * client_signature = XXXX-XXXX-XXXX-XXXX (optional string 16)
* license_signature = XXXXXXXXXX (mandatory, 1024)
* application_data = xxxxxxxxx (optional string 16)
*/
@@ -138,8 +147,18 @@
string to_date = trim_copy(
ini.GetValue(productNamePtr, "to_date",
FullLicenseInfo::UNUSED_TIME));
+ string client_signature = trim_copy(
+ ini.GetValue(productNamePtr, "client_signature", ""));
+ /*client_signature.erase(
+ std::remove(client_signature.begin(), client_signature.end(), '-'),
+ client_signature.end());*/
+ int from_sw_version = ini.GetLongValue(productNamePtr,
+ "from_sw_version", FullLicenseInfo::UNUSED_SOFTWARE_VERSION);
+ int to_sw_version = ini.GetLongValue(productNamePtr,
+ "to_sw_version", FullLicenseInfo::UNUSED_SOFTWARE_VERSION);
FullLicenseInfo licInfo(*it, product, license_signature,
- (int) license_version, from_date, to_date);
+ (int) license_version, from_date, to_date,
+ client_signature,from_sw_version,to_sw_version);
licenseInfoOut.push_back(licInfo);
atLeastOneLicenseComplete = true;
} else {
--
Gitblit v1.9.1