Upravy a opravování kryptování

This commit is contained in:
2024-04-11 14:31:24 +02:00
parent ead3ba6e3e
commit 3b1ee6038e
47 changed files with 414 additions and 422 deletions

View File

@@ -25,7 +25,7 @@ namespace Generator
PublicHeader publicHeader;
publicHeader.version = getVersion(lIdentification.revision);
publicHeader.projectDescription = projectDescription;
publicHeader.date = "4.4.2024"; //getDate();
publicHeader.date = getDate();
publicHeader.licenceType = lIdentification.licTypeName;
publicHeader.licenceType += to_string(lIdentification.licenceIndex);
@@ -98,7 +98,7 @@ namespace Generator
result.append(".");
result.append(to_string(middleVersion));
result.append(".");
string tempLicenceCount = "1"; // TODO
string tempLicenceCount = "1";
result.append(tempLicenceCount);
return result;
}
@@ -252,16 +252,9 @@ namespace Generator
privateContent.push_back(1);
privateContent.push_back(1);
privateContent.push_back(1);
// cout << "basic private: \n";
// for (const auto x : privateContent) cout << (int)x << "-";
// cout << "\n";
for (licDataItem dataItem : this->licBody.privateContent.dataItems)
{
cout << "proto: " << dataItem.protoId << "---";
privateContent.push_back(dataItem.protoId & 0xFF);
privateContent.push_back((dataItem.protoId >> 8) & 0xFF);
privateContent.push_back((dataItem.protoId >> 16) & 0xFF);
@@ -270,14 +263,8 @@ namespace Generator
privateContent.push_back((dataItem.licCount >> 8) & 0xFF);
privateContent.push_back((dataItem.licCount >> 16) & 0xFF);
privateContent.push_back((dataItem.licCount >> 24) & 0xFF);
for (const auto x : privateContent) cout << (int)x << "-";
cout << "\n";
//for (unsigned int i = 0; i < sizeof(dataItem.dummy); i++) privateContent.push_back(i);
}
cout << "\n final private \n";
#ifdef CRCCHECK
cout << "CRC private size: " << privateContent.size() << "\n";
cout << "CRC gen private: " << calculateCRC16(privateContent) << "\n";