Sync from Upstream

2019-03-15 21:17:07 +01:00
parent ea53e1f981
commit 6a52b6074f
161 changed files with 2002 additions and 1463 deletions
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -1247,7 +1247,7 @@ void MifareChkKeys_fast(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *da

        keyCount = size[1] << 8 | size[0];

-        if (keyCount == 0 && keyCount == 0xFFFF)
+        if (keyCount == 0 || keyCount == 0xFFFF)
            goto OUT;

        datain = BigBuf_malloc(keyCount * 6);
@@ -2098,4 +2098,4 @@ void Mifare_DES_Auth2(uint32_t arg0, uint8_t *datain) {
    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
    LEDsoff();
    set_tracing(false);
-}
+}