Merge branch 'master' into 213TT

This commit is contained in:
Matthew Jackson committed 2023-02-22 07:34:05 -06:00
commit 23e0268a1a
8 files changed
+21 -12

No files matched your search

+1
View File
@@ -643,6 +643,7 @@ static int CmdFlashMemInfo(const char *Cmd) {
if (got_private == false) {
mbedtls_rsa_free(rsa);
free(rsa);
}
mbedtls_pk_free(&pkctx);
+1 -1
View File
@@ -898,7 +898,7 @@ void annotateMfDesfire(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize) {
snprintf(exp, size, "R-block NACK(%d)", (cmd[0] & 0x01));
}
// I-block 000xCN1x
else if ((cmd[0] & 0xC0) == 0x00) {
else if (((cmd[0] & 0xC0) == 0x00) && (cmdsize > 2)) {
// PCB [CID] [NAD] [INF] CRC CRC
int pos = 1;
+8 -6
View File
@@ -80,12 +80,14 @@ static int sendTry(uint8_t format_idx, wiegand_card_t *card, uint32_t delay, boo
);
}
lf_hidsim_t payload;
payload.Q5 = false;
payload.hi2 = packed.Top;
payload.hi = packed.Mid;
payload.lo = packed.Bot;
payload.longFMT = (packed.Mid > 0xFFF);
lf_hidsim_t payload = {
.EM = false,
.Q5 = false,
.hi2 = packed.Top,
.hi = packed.Mid,
.lo = packed.Bot,
.longFMT = (packed.Mid > 0xFFF)
};
clearCommandBuffer();