Update confid.cpp

This commit is contained in:
pottzman 2023-09-06 22:56:28 +10:00 committed by GitHub
parent 1aeceb28f1
commit 25db955b61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 8 deletions

View File

@ -924,13 +924,6 @@ int ConfirmationID::Generate(const char* installation_id_str, char confirmation_
case 2:
case 3:
decode_iid_new_version(installation_id, hardwareID, &version);
productID[0] = stoi(productid.substr(0,5));
int channelID = stoi(productid.substr(6,3));
if (channelID == 0) {
productID[3] = ((stoi(productid.substr(10,2))) * 1000) + productID[3];
} else {
productID[3] = ((stoi(productid.substr(18,2))) * 1000) + productID[3];
}
switch (activationMode) {
case 2:
if (version != 3)
@ -941,7 +934,18 @@ int ConfirmationID::Generate(const char* installation_id_str, char confirmation_
return ERR_UNKNOWN_VERSION;
}
memcpy(&parsed, hardwareID, 8);
break;
productID[0] = stoi(productid.substr(0,5));
std::string channelid = productid.substr(6,3);
char *p = &channelid[0];
for (; *p; p++) {
*p = toupper((unsigned char)*p);
}
p = &channelid[0];
if (strcmp(p, "OEM") == 0) {
productID[3] = ((stoi(productid.substr(10,2))) * 1000) + productID[3];
} else {
productID[3] = ((stoi(productid.substr(18,2))) * 1000) + productID[3];
}
}
unsigned char keybuf[16];