From b6277b30756c96404bc747f32ae45e9d3e205447 Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: ćšć, 09 1æ 2020 10:19:22 +0800
Subject: [PATCH] pc identifiers intermediate work
---
src/library/licensecc.cpp | 29 +++++++++++++++++------------
1 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/src/library/licensecc.cpp b/src/library/licensecc.cpp
index ff57cb3..964f362 100644
--- a/src/library/licensecc.cpp
+++ b/src/library/licensecc.cpp
@@ -17,20 +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) {
+bool identify_pc(IDENTIFICATION_STRATEGY pc_id_method, char* chbuffer, size_t* bufSize) {
FUNCTION_RETURN result = FUNC_RET_BUFFER_TOO_SMALL;
- if (bufSize >= sizeof(PcSignature)) {
- PcSignature identifier_out;
- result = generate_user_pc_signature(identifier_out, pc_id_method);
- strncpy(chbuffer, identifier_out, 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;
}
@@ -69,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) {
--
Gitblit v1.9.1