Salda/sd_gen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

upravy opravy

Browse Source
This commit is contained in:
Michal Šalda
2024-04-10 08:03:43 +02:00
parent 79cc4998bc
commit ead3ba6e3e
50 changed files with 410 additions and 2846 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/generator/licGenELC2.cpp
View File

@@ -25,7 +25,7 @@ namespace Generator
PublicHeader publicHeader;
publicHeader.version = getVersion(lIdentification.revision);
publicHeader.projectDescription = projectDescription;
publicHeader.date = getDate();
publicHeader.date = "4.4.2024"; //getDate();
publicHeader.licenceType = lIdentification.licTypeName;
publicHeader.licenceType += to_string(lIdentification.licenceIndex);
@@ -135,12 +135,12 @@ namespace Generator
this->projectDescription = &xmlDoc->child(dataRootName).child("project").child_value()[0];
licBody.licenceIdentHeader.cardSize = 0;
licBody.licenceIdentHeader.cardSize={};
licBody.licenceIdentHeader.compatibilityVersion = this->lIdentification.licCompatibility;
licBody.licenceIdentHeader.licenceIndex = this->lIdentification.licenceIndex;
licBody.licenceIdentHeader.licenceType = this->lIdentification.licenceVersion;
licBody.licenceIdentHeader.licenceType = (BYTE)this->lIdentification.licLicenceType;
licBody.licenceIdentHeader.licenceTypeVersion = this->lIdentification.licenceVersion;
licBody.licenceIdentHeader.serialNumber = 0;
licBody.licenceIdentHeader.serialNumber={};
return true;
}
@@ -203,15 +203,16 @@ namespace Generator
this->licBody.licenceIdentHeader.licItemCount = this->licBody.privateContent.dataItems.size();
this->licBody.licenceIdentHeader.publicHeaderLength = this->licBody.publicHeader.length();
vector<unsigned char> publicContent;
vector<unsigned char> privateContent;
vector<unsigned char> privateContentEncrypted;
vector<unsigned char> publicContent {};
vector<unsigned char> privateContent {};
vector<unsigned char> privateContentEncrypted {};
publicContent.push_back(this->licBody.licId.licIdent[0]);
publicContent.push_back(this->licBody.licId.licIdent[1]);
publicContent.push_back(this->licBody.licId.licIdent[2]);
publicContent.push_back(((char)48 + (int)this->lIdentification.licElcType));
publicContent.push_back(this->licBody.licId.licIdent[4]);
publicContent.push_back(this->licBody.licenceIdentHeader.licenceType);
publicContent.push_back(this->licBody.licenceIdentHeader.licenceTypeVersion);
publicContent.push_back(this->licBody.licenceIdentHeader.licenceIndex);
@@ -233,6 +234,7 @@ namespace Generator
cout << "CRC gen public: " << calculateCRC16(publicContent) << "\n";
#endif
privateContent.push_back(this->licBody.licenceIdentHeader.licenceType);
privateContent.push_back(this->licBody.licenceIdentHeader.licenceTypeVersion);
privateContent.push_back(this->licBody.licenceIdentHeader.licenceIndex);
@@ -247,16 +249,35 @@ namespace Generator
privateContent.push_back((this->licBody.licenceIdentHeader.serialNumber >> 16) & 0xFF);
privateContent.push_back((this->licBody.licenceIdentHeader.serialNumber >> 24) & 0xFF);
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);
privateContent.push_back((dataItem.protoId >> 24) & 0xFF);
privateContent.push_back(dataItem.licCount & 0xFF);
privateContent.push_back((dataItem.licCount >> 8) & 0xFF);
for (unsigned int i = 0; i < sizeof(dataItem.dummy); i++)
privateContent.push_back(i);
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";