From 0ec4d68600b83d41d2e48ad35d18e2a00f234619 Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周六, 21 9月 2019 01:34:22 +0800
Subject: [PATCH] Merge branch 'develop' of https://github.com/open-license-manager/open-license-manager into develop
---
src/tools/license-generator/license-generator.cpp | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/tools/license-generator/license-generator.cpp b/src/tools/license-generator/license-generator.cpp
index 689d84c..dcffd7e 100644
--- a/src/tools/license-generator/license-generator.cpp
+++ b/src/tools/license-generator/license-generator.cpp
@@ -84,7 +84,7 @@
try {
end_date = normalize_date(dt_end);
char curdate[20];
- time_t curtime = time(NULL);
+ time_t curtime = time(nullptr);
strftime(curdate, 20, "%Y-%m-%d", localtime(&curtime));
begin_date.assign(curdate);
} catch (const invalid_argument &e) {
@@ -145,12 +145,12 @@
void LicenseGenerator::generateAndOutputLicenses(const po::variables_map& vm,
ostream& outputFile) {
vector<FullLicenseInfo> licenseInfo = parseLicenseInfo(vm);
- unique_ptr<CryptoHelper> helper = CryptoHelper::getInstance();
- const char pkey[] = PRIVATE_KEY;
- size_t len = sizeof(pkey);
+ const unique_ptr<CryptoHelper> helper = CryptoHelper::getInstance();
+ const unsigned char pkey[] = PRIVATE_KEY;
+ const size_t len = sizeof(pkey);
for (auto it = licenseInfo.begin(); it != licenseInfo.end(); ++it) {
const string license = it->printForSign();
- string signature = helper->signString((const void *)pkey,len,license);
+ const string signature = helper->signString((const void *)pkey,len,license);
it->license_signature = signature;
it->printAsIni(outputFile);
}
--
Gitblit v1.9.1