cleanup & new api

Gabriele Contini

2020-01-01 bd879d3c9f5fef0107bc3036be3893edab14e89c

 src/library/licensecc.cpp

@@ -5,8 +5,10 @@
// Copyright   : BSD
//============================================================================

#define __STDC_WANT_LIB_EXT1__ 1
#include <fstream>
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include <cstring>
#include <iostream>
@@ -16,18 +18,21 @@
#include <licensecc_properties.h>

#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)) {
   if (*bufSize >= sizeof(PcSignature)) {
      PcSignature identifier_out;
      result = generate_user_pc_signature(identifier_out, pc_id_method);
      strncpy(chbuffer, identifier_out, bufSize);
      strncpy(chbuffer, identifier_out, *bufSize);
   } else {
      *bufSize = sizeof(PcSignature);
   }
   return result == FUNC_RET_OK;
}
@@ -53,8 +58,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 +71,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) {