From 483c73630a82fe8fbe9fe74cc8bbdd23a13d8b6b Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周六, 15 2月 2020 23:49:50 +0800
Subject: [PATCH] pc identifiers work
---
src/library/limits/license_verifier.cpp | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/src/library/limits/license_verifier.cpp b/src/library/limits/license_verifier.cpp
index 2f4a7d9..71c2cc8 100644
--- a/src/library/limits/license_verifier.cpp
+++ b/src/library/limits/license_verifier.cpp
@@ -9,9 +9,9 @@
#include <licensecc_properties.h>
#include "license_verifier.hpp"
-#include "../pc_identifier/pc_identifier_facade.hpp"
-#include "../os/signature_verifier.h"
#include "../base/StringUtils.h"
+#include "../os/signature_verifier.hpp"
+#include "../hw_identifier/hw_identifier_facade.hpp"
namespace license {
using namespace std;
@@ -23,7 +23,7 @@
FUNCTION_RETURN LicenseVerifier::verify_signature(const FullLicenseInfo& licInfo) {
const string licInfoData(licInfo.printForSign());
- FUNCTION_RETURN ret = license::verify_signature(licInfoData, licInfo.license_signature);
+ FUNCTION_RETURN ret = license::os::verify_signature(licInfoData, licInfo.license_signature);
if (ret == FUNC_RET_OK) {
m_event_registry.addEvent(SIGNATURE_VERIFIED, licInfo.source);
@@ -34,31 +34,31 @@
}
// TODO: split in different classes
-FUNCTION_RETURN LicenseVerifier::verify_limits(const FullLicenseInfo& licInfo) {
- bool is_valid = LCC_VERIFY_MAGIC(licInfo);
+FUNCTION_RETURN LicenseVerifier::verify_limits(const FullLicenseInfo& lic_info) {
+ bool is_valid = LCC_VERIFY_MAGIC;
if (!is_valid) {
- m_event_registry.addEvent(LICENSE_CORRUPTED, licInfo.source.c_str());
+ m_event_registry.addEvent(LICENSE_CORRUPTED, lic_info.source.c_str());
}
const time_t now = time(nullptr);
- auto expiry = licInfo.m_limits.find(PARAM_EXPIRY_DATE);
- if (is_valid && expiry != licInfo.m_limits.end()) {
+ auto expiry = lic_info.m_limits.find(PARAM_EXPIRY_DATE);
+ if (is_valid && expiry != lic_info.m_limits.end()) {
if (seconds_from_epoch(expiry->second) < now) {
- m_event_registry.addEvent(PRODUCT_EXPIRED, licInfo.source.c_str(), ("Expired " + expiry->second).c_str());
+ m_event_registry.addEvent(PRODUCT_EXPIRED, lic_info.source.c_str(), ("Expired " + expiry->second).c_str());
is_valid = false;
}
}
- const auto start_date = licInfo.m_limits.find(PARAM_BEGIN_DATE);
- if (is_valid && start_date != licInfo.m_limits.end()) {
+ const auto start_date = lic_info.m_limits.find(PARAM_BEGIN_DATE);
+ if (is_valid && start_date != lic_info.m_limits.end()) {
if (seconds_from_epoch(start_date->second) > now) {
- m_event_registry.addEvent(PRODUCT_EXPIRED, licInfo.source.c_str(),
+ m_event_registry.addEvent(PRODUCT_EXPIRED, lic_info.source.c_str(),
("Valid from " + start_date->second).c_str());
is_valid = false;
}
}
- const auto client_sig = licInfo.m_limits.find(PARAM_CLIENT_SIGNATURE);
- if (is_valid && client_sig != licInfo.m_limits.end()) {
- const LCC_EVENT_TYPE event = PcIdentifierFacade::validate_pc_signature(client_sig->second);
- m_event_registry.addEvent(event, licInfo.source);
+ const auto client_sig = lic_info.m_limits.find(PARAM_CLIENT_SIGNATURE);
+ if (is_valid && client_sig != lic_info.m_limits.end()) {
+ const LCC_EVENT_TYPE event = hw_identifier::HwIdentifierFacade::validate_pc_signature(client_sig->second);
+ m_event_registry.addEvent(event, lic_info.source);
is_valid = is_valid && (event == LICENSE_OK);
}
return is_valid ? FUNC_RET_OK : FUNC_RET_ERROR;
@@ -66,7 +66,7 @@
LicenseInfo LicenseVerifier::toLicenseInfo(const FullLicenseInfo& fullLicInfo) const {
LicenseInfo info;
- info.license_type = LOCAL;
+ info.license_type = LCC_LOCAL;
const auto expiry = fullLicInfo.m_limits.find(PARAM_EXPIRY_DATE);
if (expiry != fullLicInfo.m_limits.end()) {
--
Gitblit v1.9.1