diff --git a/client/src/cmdpiv.c b/client/src/cmdpiv.c index 165f77c1f..d6f66bd9e 100644 --- a/client/src/cmdpiv.c +++ b/client/src/cmdpiv.c @@ -392,7 +392,7 @@ static void piv_tag_dump_int_array(const struct tlv *tlv, const struct piv_tag * for (int i = 0; i < sub_tlv.len; i++) { v = (v << 8) + sub_tlv.value[i]; } - PrintAndLogEx(NORMAL, _YELLOW_("%" PRIu64) " bytes (" _YELLOW_("%" PRIx64) ")", v, v); + PrintAndLogEx(NORMAL, _YELLOW_("%lu") " bytes (" _YELLOW_("%lx") ")", v, v); } else { // Number is to big. Just print hex value PrintAndLogEx(NORMAL, _YELLOW_("0x%s"), sprint_hex_inrow(sub_tlv.value, sub_tlv.len)); diff --git a/client/src/graph.c b/client/src/graph.c index 0bb403942..6223306d1 100644 --- a/client/src/graph.c +++ b/client/src/graph.c @@ -582,12 +582,9 @@ buffer_savestate_t save_buffer8(uint8_t *src, size_t length) { buffer_savestate_t bst = {0}; return bst; } - size_t index = 0; - - // Pack the source array into the backing array - for (size_t i = 0; i < length; i += 4) { - savedBuffer[index] = MemLeToUint4byte(src + i); - index++; + // Pack the source array into the backing array, little endian, last word zero padded + for (size_t i = 0; i < length; i++) { + savedBuffer[i / 4] |= (uint32_t)src[i] << ((i % 4) * 8); } buffer_savestate_t bst = {