From 8af6b12ee8716d2004d13bbfc81281953975b466 Mon Sep 17 00:00:00 2001
From: open-license-manager <rillf@maildrop.cc>
Date: 周一, 04 8月 2014 00:15:33 +0800
Subject: [PATCH] new identifier strategy (to be reverted
---
src/library/LicenseReader.cpp | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/library/LicenseReader.cpp b/src/library/LicenseReader.cpp
index 16662dd..05762c4 100644
--- a/src/library/LicenseReader.cpp
+++ b/src/library/LicenseReader.cpp
@@ -18,6 +18,7 @@
#include <fstream>
#include <sstream>
#include <stdlib.h>
+#include "pc-identifiers.h"
#include "LicenseReader.h"
#include "base/StringUtils.h"
#include "base/public-key.h"
@@ -65,10 +66,10 @@
}
}
if (has_client_sig) {
- UserPcIdentifier str_code;
+ PcSignature str_code;
strncpy(str_code, client_signature.c_str(), sizeof(str_code));
- EVENT_TYPE event = validate_user_pc_identifier(str_code);
- if (event != OK) {
+ EVENT_TYPE event = validate_pc_signature(str_code);
+ if (event != LICENSE_OK) {
er.addEvent(event, SEVERITY_ERROR);
}
}
@@ -148,10 +149,9 @@
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());
+ /*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,
--
Gitblit v1.9.1