From 2695752f624aa7dc3f91672c6fbeb894c22eaa47 Mon Sep 17 00:00:00 2001
From: Gabriele Contini <contini.mailing@gmail.com>
Date: 周六, 11 1月 2020 15:24:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into feature/pc_identifiers
---
src/library/limits/license_verifier.cpp | 13 ++++---------
1 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/src/library/limits/license_verifier.cpp b/src/library/limits/license_verifier.cpp
index 86ff3a1..bd2ed22 100644
--- a/src/library/limits/license_verifier.cpp
+++ b/src/library/limits/license_verifier.cpp
@@ -9,7 +9,7 @@
#include <licensecc_properties.h>
#include "license_verifier.hpp"
-#include "../pc_identifier_facade.hpp"
+#include "../pc_identifier/pc_identifier_facade.hpp"
#include "../os/signature_verifier.h"
#include "../base/StringUtils.h"
@@ -35,17 +35,14 @@
// TODO: split in different classes
FUNCTION_RETURN LicenseVerifier::verify_limits(const FullLicenseInfo& licInfo) {
- bool is_valid = VERIFY_MAGIC;
+ bool is_valid = VERIFY_MAGIC(licInfo);
if (!is_valid) {
m_event_registry.addEvent(LICENSE_CORRUPTED, licInfo.source.c_str());
}
- const const time_t now = time(nullptr);
+ const time_t now = time(nullptr);
auto expiry = licInfo.m_limits.find(PARAM_EXPIRY_DATE);
if (is_valid && expiry != licInfo.m_limits.end()) {
if (seconds_from_epoch(expiry->second) < now) {
- /*
- eventRegistryOut.addEvent(PRODUCT_EXPIRED, source.c_str(),
- string("Expired on: " + this->to_date).c_str());*/
m_event_registry.addEvent(PRODUCT_EXPIRED, licInfo.source.c_str(), ("Expired " + expiry->second).c_str());
is_valid = false;
}
@@ -53,8 +50,6 @@
const auto start_date = licInfo.m_limits.find(PARAM_BEGIN_DATE);
if (is_valid && start_date != licInfo.m_limits.end()) {
if (seconds_from_epoch(start_date->second) > now) {
- /*eventRegistryOut.addEvent(PRODUCT_EXPIRED, source.c_str(),
- string("Valid from " + this->from_date).c_str());*/
m_event_registry.addEvent(PRODUCT_EXPIRED, licInfo.source.c_str(),
("Valid from " + start_date->second).c_str());
is_valid = false;
@@ -94,7 +89,7 @@
const auto proprietary_data = fullLicInfo.m_limits.find(PARAM_EXTRA_DATA);
if (proprietary_data != fullLicInfo.m_limits.end()) {
- strncpy(info.proprietary_data, proprietary_data->second.c_str(), PROPRIETARY_DATA_SIZE);
+ strncpy(info.proprietary_data, proprietary_data->second.c_str(), API_PROPRIETARY_DATA_SIZE);
}
return info;
}
--
Gitblit v1.9.1