From 0d8b39c94e9bee14ec9c33fa6a53c48f20f0ac70 Mon Sep 17 00:00:00 2001
From: Maximilien Siavelis <maximilien.siavelis@simulease.com>
Date: 周日, 21 4月 2019 23:06:05 +0800
Subject: [PATCH] copy ini/SimpleIni.h into install directory
---
src/library/LicenseReader.cpp | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/library/LicenseReader.cpp b/src/library/LicenseReader.cpp
index 7451b9e..37274f0 100644
--- a/src/library/LicenseReader.cpp
+++ b/src/library/LicenseReader.cpp
@@ -25,8 +25,6 @@
#include "public-key.h"
#include <build_properties.h>
-#include "os/os-cpp.h"
-
namespace license {
const char *FullLicenseInfo::UNUSED_TIME = "0000-00-00";
@@ -52,8 +50,9 @@
EventRegistry FullLicenseInfo::validate(int sw_version) {
EventRegistry er;
os_initialize();
- bool sigVerified = OsFunctions::verifySignature(printForSign().c_str(),
+ FUNCTION_RETURN sigVer = verifySignature(printForSign().c_str(),
license_signature.c_str());
+ bool sigVerified = sigVer == FUNC_RET_OK;
if (sigVerified) {
er.addEvent(LICENSE_VERIFIED, SVRT_INFO);
} else {
@@ -91,8 +90,9 @@
license->days_left = 999999;
} else {
strncpy(license->expiry_date, to_date.c_str(), 11);
- double secs = difftime(time(NULL),
- seconds_from_epoch(to_date.c_str()));
+ double secs = difftime(
+ seconds_from_epoch(to_date.c_str()),
+ time(NULL));
license->days_left = (int) secs / 60 * 60 * 24;
}
}
--
Gitblit v1.9.1