diff --git a/include/common/licenceELC2.h b/include/common/licenceELC2.h index b440a10..7801a2d 100644 --- a/include/common/licenceELC2.h +++ b/include/common/licenceELC2.h @@ -41,7 +41,6 @@ public: DWORD serialNumber = {}; // seriove cislo karty }; - /// struct licDataItem { DWORD protoId{}; // id protokolu pro ktery je licence diff --git a/output/ezlic_drt0_jjacdgpdxpb.lic b/output/ezlic_drt0_jjacdgpdxpb.lic index d9a31ab..88d5018 100644 Binary files a/output/ezlic_drt0_jjacdgpdxpb.lic and b/output/ezlic_drt0_jjacdgpdxpb.lic differ diff --git a/output/licenceGenerator b/output/licenceGenerator index 69433f9..60fc40f 100644 Binary files a/output/licenceGenerator and b/output/licenceGenerator differ diff --git a/src/common/licenceELC2.cpp b/src/common/licenceELC2.cpp index 7c62aee..bf86885 100644 --- a/src/common/licenceELC2.cpp +++ b/src/common/licenceELC2.cpp @@ -132,8 +132,8 @@ void LicenceELC2::initVector(BYTE *iVector, BYTE *key) this->sdCard.cardData.CID_nibble[25] - 15, this->sdCard.cardData.CID_nibble[21] - 15, 9, 10, 11, 12, 13, 14, 15, 16}; - CryptInitVector vec2 = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16}; // TODO přidat smysluplnější indexy - CryptInitVector vec3 = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16}; + CryptInitVector vec2 = {5, 1, 3, this->sdCard.cardData.CID[9], 4, 12, 13, 17, 9, this->sdCard.cardData.CID_nibble[24]-15, 2, 23, 17, 13, 4, 3}; + CryptInitVector vec3 = {2, 7, 1, this->sdCard.cardData.CID[6], 8, 13, 16, 6, 4, this->sdCard.cardData.CID_nibble[20]-15, 8, 7, 2, 14, 15, 21}; std::unordered_map vectors; vectors.insert(std::pair(1, vec1));