type confusing
This commit is contained in:
1 parent
bae03ec792
commit
85fafb5906
1 file changed
+6
-6
@@ -1509,7 +1509,7 @@ int loadFileJSONex(const char *preferredName, void *data, size_t maxdatalen, siz
|
|||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
snprintf(blocks, sizeof(blocks), "$.blocks.%zu", i);
|
snprintf(blocks, sizeof(blocks), "$.blocks.%d", i);
|
||||||
JsonLoadBufAsHex(root, blocks, &udata.bytes[sptr], 4, &len);
|
JsonLoadBufAsHex(root, blocks, &udata.bytes[sptr], 4, &len);
|
||||||
if (load_file_sanity(ctype, 4, i, len) == false) {
|
if (load_file_sanity(ctype, 4, i, len) == false) {
|
||||||
break;
|
break;
|
||||||
@@ -1531,7 +1531,7 @@ int loadFileJSONex(const char *preferredName, void *data, size_t maxdatalen, siz
|
|||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
snprintf(blocks, sizeof(blocks), "$.blocks.%zu", i);
|
snprintf(blocks, sizeof(blocks), "$.blocks.%d", i);
|
||||||
JsonLoadBufAsHex(root, blocks, &udata.bytes[sptr], PICOPASS_BLOCK_SIZE, &len);
|
JsonLoadBufAsHex(root, blocks, &udata.bytes[sptr], PICOPASS_BLOCK_SIZE, &len);
|
||||||
if (load_file_sanity(ctype, PICOPASS_BLOCK_SIZE, i, len) == false) {
|
if (load_file_sanity(ctype, PICOPASS_BLOCK_SIZE, i, len) == false) {
|
||||||
break;
|
break;
|
||||||
@@ -1552,7 +1552,7 @@ int loadFileJSONex(const char *preferredName, void *data, size_t maxdatalen, siz
|
|||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
snprintf(blocks, sizeof(blocks), "$.blocks.%zu", i);
|
snprintf(blocks, sizeof(blocks), "$.blocks.%d", i);
|
||||||
JsonLoadBufAsHex(root, blocks, &udata.bytes[sptr], 4, &len);
|
JsonLoadBufAsHex(root, blocks, &udata.bytes[sptr], 4, &len);
|
||||||
if (load_file_sanity(ctype, 4, i, len) == false) {
|
if (load_file_sanity(ctype, 4, i, len) == false) {
|
||||||
break;
|
break;
|
||||||
@@ -1573,7 +1573,7 @@ int loadFileJSONex(const char *preferredName, void *data, size_t maxdatalen, siz
|
|||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
snprintf(blocks, sizeof(blocks), "$.blocks.%zu", i);
|
snprintf(blocks, sizeof(blocks), "$.blocks.%d", i);
|
||||||
JsonLoadBufAsHex(root, blocks, &udata.bytes[sptr], 4, &len);
|
JsonLoadBufAsHex(root, blocks, &udata.bytes[sptr], 4, &len);
|
||||||
if (load_file_sanity(ctype, 4, i, len) == false) {
|
if (load_file_sanity(ctype, 4, i, len) == false) {
|
||||||
break;
|
break;
|
||||||
@@ -1715,10 +1715,10 @@ int loadFileJSONex(const char *preferredName, void *data, size_t maxdatalen, siz
|
|||||||
|
|
||||||
size_t offset = (14 + atslen) + (i * 2 * AES_KEY_LEN);
|
size_t offset = (14 + atslen) + (i * 2 * AES_KEY_LEN);
|
||||||
|
|
||||||
snprintf(blocks, sizeof(blocks), "$.SectorKeys.%zu.KeyA", i);
|
snprintf(blocks, sizeof(blocks), "$.SectorKeys.%d.KeyA", i);
|
||||||
JsonLoadBufAsHex(root, blocks, udata.bytes + offset, AES_KEY_LEN, datalen);
|
JsonLoadBufAsHex(root, blocks, udata.bytes + offset, AES_KEY_LEN, datalen);
|
||||||
|
|
||||||
snprintf(blocks, sizeof(blocks), "$.SectorKeys.%zu.KeyB", i);
|
snprintf(blocks, sizeof(blocks), "$.SectorKeys.%d.KeyB", i);
|
||||||
JsonLoadBufAsHex(root, blocks, udata.bytes + offset + AES_KEY_LEN, AES_KEY_LEN, datalen);
|
JsonLoadBufAsHex(root, blocks, udata.bytes + offset + AES_KEY_LEN, AES_KEY_LEN, datalen);
|
||||||
|
|
||||||
sptr += (2 * AES_KEY_LEN);
|
sptr += (2 * AES_KEY_LEN);
|
||||||
|
|||||||
Reference in new issue
Block a user