From 84597288d950867922a185b2c5a8231495a5d303 Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周六, 11 1月 2020 15:24:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into feature/pc_identifiers
---
src/library/licensecc.cpp | 46 ++++++++++++++++++++++++++++------------------
1 files changed, 28 insertions(+), 18 deletions(-)
diff --git a/src/library/licensecc.cpp b/src/library/licensecc.cpp
index c7484c3..9b5f5ca 100644
--- a/src/library/licensecc.cpp
+++ b/src/library/licensecc.cpp
@@ -1,12 +1,14 @@
//============================================================================
-// Name : license-manager-cpp.cpp
+// Name : licensecc.cpp
// Author :
// Version :
// Copyright : BSD
//============================================================================
+#define __STDC_WANT_LIB_EXT1__ 1
#include <fstream>
#include <stdio.h>
+#include <string.h>
#include <stdlib.h>
#include <cstring>
#include <iostream>
@@ -15,19 +17,21 @@
#include <licensecc/licensecc.h>
#include <licensecc_properties.h>
+#include "pc_identifier/pc_identifier_facade.hpp"
#include "limits/license_verifier.hpp"
+#include "base/StringUtils.h"
#include "LicenseReader.hpp"
-#include "pc-identifiers.h"
using namespace std;
-void print_error(char out_buffer[256], LicenseInfo* licenseInfo) {}
-bool identify_pc(IDENTIFICATION_STRATEGY pc_id_method, char* chbuffer, size_t bufSize) {
- PcSignature identifier_out;
- FUNCTION_RETURN result = FUNC_RET_BUFFER_TOO_SMALL;
- if (bufSize >= sizeof(PcSignature)) {
- result = generate_user_pc_signature(identifier_out, pc_id_method);
- strncpy(chbuffer, identifier_out, bufSize);
+void print_error(char out_buffer[API_ERROR_BUFFER_SIZE], LicenseInfo* licenseInfo) {}
+
+bool identify_pc(IDENTIFICATION_STRATEGY pc_id_method, char* chbuffer, size_t* bufSize) {
+ string pc_id = license::PcIdentifierFacade::generate_user_pc_signature(pc_id_method);
+ if (*bufSize >= pc_id.size() + 1) {
+ strncpy(chbuffer, pc_id.c_str(), *bufSize);
+ } else {
+ *bufSize = pc_id.size() + 1;
}
return result == FUNC_RET_OK;
}
@@ -53,8 +57,10 @@
const license::LicenseReader lr = license::LicenseReader(licenseLocation);
vector<license::FullLicenseInfo> licenses;
string project;
- if (callerInformation != nullptr && strlen(callerInformation->project_name) > 0) {
- project = string(callerInformation->project_name);
+ size_t str_size;
+ if (callerInformation != nullptr &&
+ (str_size = license::mstrnlen_s(callerInformation->project_name, sizeof callerInformation->project_name)) > 0) {
+ project = string(callerInformation->project_name, str_size);
} else {
project = string(LCC_PROJECT_NAME);
}
@@ -64,16 +70,20 @@
vector<LicenseInfo> licenses_with_errors;
vector<LicenseInfo> licenses_ok;
license::LicenseVerifier verifier(er);
- for (auto it = licenses.begin(); it != licenses.end(); it++) {
- FUNCTION_RETURN signatureValid = verifier.verify_signature(*it);
+ for (auto full_lic_info_it = licenses.begin(); full_lic_info_it != licenses.end(); full_lic_info_it++) {
+ if (callerInformation != nullptr) {
+ full_lic_info_it->m_magic = callerInformation->magic;
+ }
+ const FUNCTION_RETURN signatureValid = verifier.verify_signature(*full_lic_info_it);
+ LicenseInfo licInfo = verifier.toLicenseInfo(*full_lic_info_it);
if (signatureValid == FUNC_RET_OK) {
- if (verifier.verify_limits(*it) == FUNC_RET_OK) {
- licenses_ok.push_back(verifier.toLicenseInfo(*it));
+ if (verifier.verify_limits(*full_lic_info_it) == FUNC_RET_OK) {
+ licenses_ok.push_back(licInfo);
} else {
- licenses_with_errors.push_back(verifier.toLicenseInfo(*it));
+ licenses_with_errors.push_back(licInfo);
}
} else {
- licenses_with_errors.push_back(verifier.toLicenseInfo(*it));
+ licenses_with_errors.push_back(licInfo);
}
}
if (licenses_ok.size() > 0) {
@@ -99,7 +109,7 @@
#endif
if (license_out != nullptr) {
- er.exportLastEvents(license_out->status, AUDIT_EVENT_NUM);
+ er.exportLastEvents(license_out->status, API_AUDIT_EVENT_NUM);
}
return result;
}
--
Gitblit v1.9.1