dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

comparison of integers of different signs [-Wsign-compare]

Browse Source
This commit is contained in:
Philippe Teuwen
2019-04-13 23:38:34 +02:00
parent ce606b51fc
commit 97676d3210
17 changed files with 85 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/mifare/mfkey.c
View File

@@ -27,7 +27,7 @@ uint32_t intersection(uint64_t *listA, uint64_t *listB) {
p1 = p3 = listA;
p2 = listB;
while (*p1 != -1 && *p2 != -1) {
while (*p1 != UINT64_C(-1) && *p2 != UINT64_C(-1)) {
if (compare_uint64(p1, p2) == 0) {
*p3++ = *p1++;
p2++;
@@ -36,7 +36,7 @@ uint32_t intersection(uint64_t *listA, uint64_t *listB) {
while (compare_uint64(p1, p2) > 0) ++p2;
}
}
*p3 = -1;
*p3 = UINT64_C(-1);
return p3 - listA;
}

12
client/mifare/mifarehost.c
View File

@@ -89,13 +89,13 @@ int mfDarkside(uint8_t blockno, uint8_t key_type, uint64_t *key) {
PrintAndLogEx(SUCCESS, "found %u candidate key%s\n", keycount, (keycount > 1) ? "s." : ".");
*key = -1;
*key = UINT64_C(-1);
uint8_t keyBlock[USB_CMD_DATA_SIZE];
int max_keys = USB_CMD_DATA_SIZE / 6;
for (int i = 0; i < keycount; i += max_keys) {
uint32_t max_keys = USB_CMD_DATA_SIZE / 6;
for (uint32_t i = 0; i < keycount; i += max_keys) {
int size = keycount - i > max_keys ? max_keys : keycount - i;
for (int j = 0; j < size; j++) {
uint32_t size = keycount - i > max_keys ? max_keys : keycount - i;
for (uint32_t j = 0; j < size; j++) {
if (par_list == 0) {
num_to_bytes(last_keylist[i * max_keys + j], 6, keyBlock + (j * 6));
} else {
@@ -108,7 +108,7 @@ int mfDarkside(uint8_t blockno, uint8_t key_type, uint64_t *key) {
}
}
if (*key != -1) {
if (*key != UINT64_C(-1)) {
break;
} else {
PrintAndLogEx(FAILED, "all candidate keys failed. Restarting darkside attack");