Merge fa956e02ba7b49b4f820cbd4e83aeae159b67df4 into ba072f16f6b2a655d51da2171ecfb83e26c0ef58

This commit is contained in:
Álvaro GR 2018-08-14 00:38:52 +00:00 committed by GitHub
commit 5dc7f13f8b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -443,27 +443,25 @@ int main(int argc, char *const argv[])
fprintf(stdout, "\n"); fprintf(stdout, "\n");
for (i = 0; i < (t.num_sectors); ++i) { for (i = 0; i < (t.num_sectors); ++i) {
if(t.sectors[i].foundKeyA){ if (t.sectors[i].foundKeyA) {
fprintf(stdout, "Sector %02d - Found Key A: %012llx ", i, bytes_to_num(t.sectors[i].KeyA, sizeof(t.sectors[i].KeyA))); knownKey = bytes_to_num(t.sectors[i].KeyA, sizeof(t.sectors[i].KeyA));
memcpy(&knownKey, t.sectors[i].KeyA, 6); fprintf(stdout, "Sector %02d - Found Key A: %012llx ", i, knownKey);
knownKeyLetter = 'A'; knownKeyLetter = 'A';
knownSector = i; knownSector = i;
} } else {
else{
fprintf(stdout, "Sector %02d - Unknown Key A ", i); fprintf(stdout, "Sector %02d - Unknown Key A ", i);
unknownSector = i;
unknownKeyLetter = 'A'; unknownKeyLetter = 'A';
}
if(t.sectors[i].foundKeyB){
fprintf(stdout, "Found Key B: %012llx\n", bytes_to_num(t.sectors[i].KeyB, sizeof(t.sectors[i].KeyB)));
knownKeyLetter = 'B';
memcpy(&knownKey, t.sectors[i].KeyB, 6);
knownSector = i;
}
else{
fprintf(stdout, "Unknown Key B\n");
unknownSector = i; unknownSector = i;
}
if (t.sectors[i].foundKeyB) {
knownKey = bytes_to_num(t.sectors[i].KeyB, sizeof(t.sectors[i].KeyB));
fprintf(stdout, "Found Key B: %012llx\n", knownKey);
knownKeyLetter = 'B';
knownSector = i;
} else {
fprintf(stdout, "Unknown Key B\n");
unknownKeyLetter = 'B'; unknownKeyLetter = 'B';
unknownSector = i;
} }
} }
fflush(stdout); fflush(stdout);