Merge pull request #10 from RfidResearchGroup/master

Update from master

Makefile

@@ -112,7 +112,7 @@ help:
 	@echo "+ all             - Make all targets: bootrom, fullimage and OS-specific host tools"
 	@echo "+ clean           - Clean in all targets"
 	@echo "+ .../clean       - Clean in specified target and its deps, e.g. bootrom/clean"
-	@echo "+ (un)install     - Install/uninstall Proxmark files in the system, default to /usr/local/share,
+	@echo "+ (un)install     - Install/uninstall Proxmark files in the system, default to /usr/local/share,"
 	@echo "                    else provide a PREFIX. See Maintainers.md for more options"
 	@echo
 	@echo "+ bootrom         - Make bootrom"

armsrc/appmain.c

@@ -206,8 +206,9 @@ void MeasureAntennaTuning(void) {
     LEDsoff();
 }
 
+// Measure HF in milliVolt
 uint16_t MeasureAntennaTuningHfData(void) {
-    uint16_t volt = 0; // in mV
+    uint16_t volt = 0;
     uint16_t avg = AvgAdc(ADC_CHAN_HF);
     volt = (MAX_ADC_HF_VOLTAGE * avg) >> 10;
     bool use_high = (volt > MAX_ADC_HF_VOLTAGE - 300);
@@ -219,6 +220,11 @@ uint16_t MeasureAntennaTuningHfData(void) {
     return volt;
 }
 
+// Measure LF in milliVolt
+uint32_t MeasureAntennaTuningLfData(void) {
+    return  (MAX_ADC_LF_VOLTAGE * AvgAdc(ADC_CHAN_LF)) >> 10;
+}
+
 void ReadMem(int addr) {
     const uint8_t *data = ((uint8_t *)addr);
 
@@ -698,7 +704,7 @@ static void PacketReceived(PacketCommandNG *packet) {
         }
         case CMD_LF_HID_DEMOD: {
             uint32_t high, low;
-            CmdHIDdemodFSK(packet->oldarg[0], &high, &low, 1);
+            CmdHIDdemodFSK(0, &high, &low, 1);
             break;
         }
         case CMD_LF_HID_SIMULATE: {
@@ -727,7 +733,7 @@ static void PacketReceived(PacketCommandNG *packet) {
         }
         case CMD_LF_IO_DEMOD: {
             uint32_t high, low;
-            CmdIOdemodFSK(packet->oldarg[0], &high, &low, 1);
+            CmdIOdemodFSK(0, &high, &low, 1);
             break;
         }
         case CMD_LF_EM410X_DEMOD: {
@@ -838,7 +844,7 @@ static void PacketReceived(PacketCommandNG *packet) {
         case CMD_LF_AWID_DEMOD:  {
             uint32_t high, low;
             // Set realtime AWID demodulation
-            CmdAWIDdemodFSK(packet->oldarg[0], &high, &low, 1);
+            CmdAWIDdemodFSK(0, &high, &low, 1);
             break;
         }
         case CMD_LF_VIKING_CLONE: {
@@ -1415,6 +1421,7 @@ static void PacketReceived(PacketCommandNG *packet) {
         case CMD_MEASURE_ANTENNA_TUNING_HF: {
             if (packet->length != 1)
                 reply_ng(CMD_MEASURE_ANTENNA_TUNING_HF, PM3_EINVARG, NULL, 0);
+
             switch (packet->data.asBytes[0]) {
                 case 1: // MEASURE_ANTENNA_TUNING_HF_START
                     // Let the FPGA drive the high-frequency antenna around 13.56 MHz.
@@ -1438,6 +1445,35 @@ static void PacketReceived(PacketCommandNG *packet) {
             }
             break;
         }
+        case CMD_MEASURE_ANTENNA_TUNING_LF: {
+            if (packet->length != 1)
+                reply_ng(CMD_MEASURE_ANTENNA_TUNING_LF, PM3_EINVARG, NULL, 0);
+
+            switch (packet->data.asBytes[0]) {
+                case 1: // MEASURE_ANTENNA_TUNING_LF_START
+                    // Let the FPGA drive the low-frequency antenna around 125kHz
+                    FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
+                    FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_ADC | FPGA_LF_ADC_READER_FIELD);
+                    FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95);
+                    reply_ng(CMD_MEASURE_ANTENNA_TUNING_LF, PM3_SUCCESS, NULL, 0);
+                    break;
+                case 2:
+                    if (button_status == BUTTON_SINGLE_CLICK)
+                        reply_ng(CMD_MEASURE_ANTENNA_TUNING_LF, PM3_EOPABORTED, NULL, 0);
+
+                    uint32_t volt = MeasureAntennaTuningLfData();
+                    reply_ng(CMD_MEASURE_ANTENNA_TUNING_LF, PM3_SUCCESS, (uint8_t *)&volt, sizeof(volt));
+                    break;
+                case 3:
+                    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+                    reply_ng(CMD_MEASURE_ANTENNA_TUNING_LF, PM3_SUCCESS, NULL, 0);
+                    break;
+                default:
+                    reply_ng(CMD_MEASURE_ANTENNA_TUNING_LF, PM3_EINVARG, NULL, 0);
+                    break;
+            }
+            break;
+        }
         case CMD_LISTEN_READER_FIELD: {
             if (packet->length != sizeof(uint8_t))
                 break;

armsrc/lfops.c

@@ -1245,6 +1245,10 @@ void CmdAWIDdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol)
         DoAcquisition_default(-1, true);
         // FSK demodulator
 
+        size  = BigBuf_max_traceLen();
+        //askdemod and manchester decode
+        if (size > 12800) size = 12800; //big enough to catch 2 sequences of largest format
+
         int idx = detectAWID(dest, &size, &dummyIdx);
 
         if (idx <= 0 || size != 96) continue;
@@ -1306,10 +1310,10 @@ void CmdAWIDdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol)
             *low = rawLo;
             break;
         }
-        WDT_HIT();
     }
+
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-    DbpString("Stopped");
+    DbpString("AWID fsk demod stopped");
     if (ledcontrol) LED_A_OFF();
 }
 
@@ -1366,12 +1370,12 @@ void CmdEM410xdemod(int findone, uint32_t *high, uint64_t *low, int ledcontrol)
                 break;
             }
         }
-        WDT_HIT();
         hi = lo = size = idx = 0;
         clk = invert = 0;
     }
+
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-    DbpString("Stopped");
+    DbpString("EM man/ask demod stopped");
     if (ledcontrol) LED_A_OFF();
 }
 
@@ -1398,7 +1402,10 @@ void CmdIOdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol) {
         DoAcquisition_default(-1, true);
 
         //fskdemod and get start index
-        WDT_HIT();
+        size  = BigBuf_max_traceLen();
+        //askdemod and manchester decode
+        if (size > 12000) size = 12000; //big enough to catch 2 sequences of largest format
+
         int idx = detectIOProx(dest, &size, &dummyIdx);
         if (idx < 0) continue;
         //valid tag found
@@ -1455,10 +1462,11 @@ void CmdIOdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol) {
         code = code2 = 0;
         version = facilitycode = 0;
         number = 0;
-        WDT_HIT();
+        calccrc = 0;
     }
+
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-    DbpString("Stopped");
+    DbpString("IOProx fsk demod stopped");
     if (ledcontrol) LED_A_OFF();
 }
 

client/cmddata.c

@@ -518,7 +518,6 @@ int ASKDemod_ext(const char *Cmd, bool verbose, bool emSearch, uint8_t askType,
     size_t maxLen = 0;
     uint8_t askamp = 0;
     char amp = tolower(param_getchar(Cmd, 0));
-    uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
 
     sscanf(Cmd, "%i %i %i %zu %c", &clk, &invert, &maxErr, &maxLen, &amp);
 
@@ -533,12 +532,19 @@ int ASKDemod_ext(const char *Cmd, bool verbose, bool emSearch, uint8_t askType,
         invert = 1;
         clk = 0;
     }
+    uint8_t *bits =  calloc(MAX_GRAPH_TRACE_LEN, sizeof(uint8_t));
+    if (bits == NULL) {
+        return PM3_EMALLOC;
+    }
 
     size_t BitLen = getFromGraphBuf(bits);
 
     PrintAndLogEx(DEBUG, "DEBUG: (ASKDemod_ext) #samples from graphbuff: %d", BitLen);
 
-    if (BitLen < 255) return PM3_ESOFT;
+    if (BitLen < 255) {
+        free(bits);
+        return PM3_ESOFT;
+    }
 
     if (maxLen < BitLen && maxLen != 0) BitLen = maxLen;
 
@@ -572,11 +578,13 @@ int ASKDemod_ext(const char *Cmd, bool verbose, bool emSearch, uint8_t askType,
 
     if (errCnt < 0 || BitLen < 16) { //if fatal error (or -1)
         PrintAndLogEx(DEBUG, "DEBUG: (ASKDemod_ext) No data found errors:%d, invert:%c, bitlen:%d, clock:%d", errCnt, (invert) ? 'Y' : 'N', BitLen, clk);
+        free(bits);
         return PM3_ESOFT;
     }
 
     if (errCnt > maxErr) {
         PrintAndLogEx(DEBUG, "DEBUG: (ASKDemod_ext) Too many errors found, errors:%d, bits:%d, clock:%d", errCnt, BitLen, clk);
+        free(bits);
         return PM3_ESOFT;
     }
 
@@ -601,6 +609,7 @@ int ASKDemod_ext(const char *Cmd, bool verbose, bool emSearch, uint8_t askType,
     if (emSearch)
         AskEm410xDecode(true, &hi, &lo);
 
+    free(bits);
     return PM3_SUCCESS;
 }
 int ASKDemod(const char *Cmd, bool verbose, bool emSearch, uint8_t askType) {
@@ -801,7 +810,7 @@ int AutoCorrelate(const int *in, int *out, size_t len, size_t window, bool SaveG
     // Computed variance
     double variance = compute_variance(in, len);
 
-    static int CorrelBuffer[MAX_GRAPH_TRACE_LEN];
+    int *correl_buf = calloc(MAX_GRAPH_TRACE_LEN, sizeof(int));
 
     for (size_t i = 0; i < len - window; ++i) {
 
@@ -810,7 +819,7 @@ int AutoCorrelate(const int *in, int *out, size_t len, size_t window, bool SaveG
         }
         autocv = (1.0 / (len - i)) * autocv;
 
-        CorrelBuffer[i] = autocv;
+        correl_buf[i] = autocv;
 
         // Computed autocorrelation value to be returned
         // Autocorrelation is autocovariance divided by variance
@@ -827,15 +836,15 @@ int AutoCorrelate(const int *in, int *out, size_t len, size_t window, bool SaveG
     int hi = 0, idx = 0;
     int distance = 0, hi_1 = 0, idx_1 = 0;
     for (size_t i = 0; i <= len; ++i) {
-        if (CorrelBuffer[i] > hi) {
+        if (correl_buf[i] > hi) {
-            hi = CorrelBuffer[i];
+            hi = correl_buf[i];
             idx = i;
         }
     }
 
     for (size_t i = idx + 1; i <= window; ++i) {
-        if (CorrelBuffer[i] > hi_1) {
+        if (correl_buf[i] > hi_1) {
-            hi_1 = CorrelBuffer[i];
+            hi_1 = correl_buf[i];
             idx_1 = i;
         }
     }
@@ -855,7 +864,7 @@ int AutoCorrelate(const int *in, int *out, size_t len, size_t window, bool SaveG
     int retval = correlation;
     if (SaveGrph) {
         //GraphTraceLen = GraphTraceLen - window;
-        memcpy(out, CorrelBuffer, len * sizeof(int));
+        memcpy(out, correl_buf, len * sizeof(int));
         if (distance > 0) {
             setClockGrid(distance, idx);
             retval = distance;
@@ -867,7 +876,7 @@ int AutoCorrelate(const int *in, int *out, size_t len, size_t window, bool SaveG
         DemodBufferLen = 0;
         RepaintGraphWindow();
     }
-
+    free(correl_buf);
     return retval;
 }
 
@@ -1106,9 +1115,16 @@ int FSKrawDemod(const char *Cmd, bool verbose) {
     if (getSignalProperties()->isnoise)
         return PM3_ESOFT;
 
-    uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
+    uint8_t *bits = calloc(MAX_GRAPH_TRACE_LEN, sizeof(uint8_t));
+    if (bits == NULL) {
+        return PM3_EMALLOC;
+    }
+    
     size_t BitLen = getFromGraphBuf(bits);
-    if (BitLen == 0) return PM3_ESOFT;
+    if (BitLen == 0) {
+        free(bits);
+        return PM3_ESOFT;
+    }
     
     //get field clock lengths
     if (!fchigh || !fclow) {
@@ -1139,10 +1155,13 @@ int FSKrawDemod(const char *Cmd, bool verbose) {
             PrintAndLogEx(NORMAL, "%s decoded bitstream:", GetFSKType(fchigh, fclow, invert));
             printDemodBuff();
         }
-        return PM3_SUCCESS;
+        goto out;
     } else {
         PrintAndLogEx(DEBUG, "no FSK data found");
     }
+
+out:    
+    free(bits);
     return PM3_SUCCESS;
 }
 
@@ -1176,19 +1195,26 @@ int PSKDemod(const char *Cmd, bool verbose) {
     if (getSignalProperties()->isnoise)
         return PM3_ESOFT;
 
-    uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
+    uint8_t *bits = calloc(MAX_GRAPH_TRACE_LEN, sizeof(uint8_t));
+    if (bits == NULL) {
+        return PM3_EMALLOC;
+    }
     size_t bitlen = getFromGraphBuf(bits);
-    if (bitlen == 0)
+    if (bitlen == 0) {
+        free(bits);
         return PM3_ESOFT;
+    }
     
     int startIdx = 0;
     int errCnt = pskRawDemod_ext(bits, &bitlen, &clk, &invert, &startIdx);
     if (errCnt > maxErr) {
         if (g_debugMode || verbose) PrintAndLogEx(DEBUG, "DEBUG: (PSKdemod) Too many errors found, clk: %d, invert: %d, numbits: %d, errCnt: %d", clk, invert, bitlen, errCnt);
+        free(bits);
         return PM3_ESOFT;
     }
     if (errCnt < 0 || bitlen < 16) { //throw away static - allow 1 and -1 (in case of threshold command first)
         if (g_debugMode || verbose) PrintAndLogEx(DEBUG, "DEBUG: (PSKdemod) no data found, clk: %d, invert: %d, numbits: %d, errCnt: %d", clk, invert, bitlen, errCnt);
+        free(bits);
         return PM3_ESOFT;
     }
     if (verbose || g_debugMode) {
@@ -1200,6 +1226,7 @@ int PSKDemod(const char *Cmd, bool verbose) {
     //prime demod buffer for output
     setDemodBuff(bits, bitlen, 0);
     setClockGrid(clk, startIdx);
+    free(bits);
     return PM3_SUCCESS;
 }
 
@@ -1291,20 +1318,30 @@ int NRZrawDemod(const char *Cmd, bool verbose) {
     if (getSignalProperties()->isnoise)
         return PM3_ESOFT;
 
-    uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
+    uint8_t *bits = calloc(MAX_GRAPH_TRACE_LEN, sizeof(uint8_t));
+    if (bits == NULL) {
+        return PM3_EMALLOC;
+    }
+            
     size_t BitLen = getFromGraphBuf(bits);
 
-    if (BitLen == 0) return PM3_ESOFT;
+    if (BitLen == 0) {
+        free(bits);
+        return PM3_ESOFT;
+    }
 
     errCnt = nrzRawDemod(bits, &BitLen, &clk, &invert, &clkStartIdx);
     if (errCnt > maxErr) {
         PrintAndLogEx(DEBUG, "DEBUG: (NRZrawDemod) Too many errors found, clk: %d, invert: %d, numbits: %d, errCnt: %d", clk, invert, BitLen, errCnt);
+        free(bits);
         return PM3_ESOFT;
     }
     if (errCnt < 0 || BitLen < 16) { //throw away static - allow 1 and -1 (in case of threshold command first)
         PrintAndLogEx(DEBUG, "DEBUG: (NRZrawDemod) no data found, clk: %d, invert: %d, numbits: %d, errCnt: %d", clk, invert, BitLen, errCnt);
+        free(bits);
         return PM3_ESOFT;
     }
+    
     if (verbose || g_debugMode) PrintAndLogEx(DEBUG, "DEBUG: (NRZrawDemod) Tried NRZ Demod using Clock: %d - invert: %d - Bits Found: %d", clk, invert, BitLen);
     //prime demod buffer for output
     setDemodBuff(bits, BitLen, 0);
@@ -1317,6 +1354,8 @@ int NRZrawDemod(const char *Cmd, bool verbose) {
         // Now output the bitstream to the scrollback by line of 16 bits
         printDemodBuff();
     }
+    
+    free(bits);
     return PM3_SUCCESS;
 }
 

client/cmdhf.c

@@ -60,11 +60,12 @@ static int usage_hf_sniff() {
 }
 
 static int usage_hf_tune() {
-    PrintAndLogEx(NORMAL, "Usage: hf tune [<iter>]");
     PrintAndLogEx(NORMAL, "Continuously measure HF antenna tuning.");
     PrintAndLogEx(NORMAL, "Press button or Enter to interrupt.");
+    PrintAndLogEx(NORMAL, "Usage: hf tune [h] [<iter>]");
     PrintAndLogEx(NORMAL, "Options:");
-    PrintAndLogEx(NORMAL, "       <iter>               - number of iterations (default: infinite)");
+    PrintAndLogEx(NORMAL, "       h             - This help");
+    PrintAndLogEx(NORMAL, "       <iter>        - number of iterations (default: 0=infinite)");
     PrintAndLogEx(NORMAL, "");
     return PM3_SUCCESS;
 }
@@ -137,6 +138,7 @@ int CmdHFSearch(const char *Cmd) {
     }
 
 
+//    PrintAndLogEx(INPLACE, "Searching for FeliCa tag...");
     //if (IfPm3Felica()) {
     //    ans = CmdHFFelicaReader("s");
     //    if (ans) {
@@ -146,7 +148,8 @@ int CmdHFSearch(const char *Cmd) {
     //}
 
 
-    PrintAndLogEx(FAILED, "\nNo known/supported 13.56 MHz tags found\n");
+    PrintAndLogEx(INPLACE, "No known/supported 13.56 MHz tags found");
+    PrintAndLogEx(NORMAL, "");
     return PM3_ESOFT;
 }
 

client/cmdhflegic.c

@@ -1340,6 +1340,7 @@ int readLegicUid(bool verbose) {
         default:
             break;
     }
+    PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(SUCCESS, " UID : %s", sprint_hex(card.uid, sizeof(card.uid)));
     legic_print_type(card.cardsize, 0);
     return PM3_SUCCESS;

client/cmdhfthinfilm.c

@@ -49,6 +49,7 @@ static int usage_thinfilm_sim(void) {
 //    https://github.com/nfc-tools/libnfc/blob/master/utils/nfc-barcode.c
 static int print_barcode(uint8_t *barcode, const size_t barcode_len, bool verbose) {
 
+    PrintAndLogEx(NORMAL, "");
     // remove start bit
     uint8_t mb = barcode[0] & ~0x80;
     PrintAndLogEx(SUCCESS, "    Manufacturer : "_YELLOW_("%s") "[0x%02X]",  getTagInfo(mb), mb);

client/cmdhftopaz.c

@@ -433,6 +433,7 @@ static int CmdHFTopazReader(const char *Cmd) {
         return PM3_ESOFT;
     }
 
+    PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "ATQA : %02x %02x", atqa[1], atqa[0]);
 
     topaz_tag.HR01[0] = rid_response[0];

client/cmdlf.c

@@ -190,6 +190,59 @@ static int usage_lf_find(void) {
     PrintAndLogEx(NORMAL, "      lf search 1 u = use data from GraphBuffer & search for known and unknown tags");
     return PM3_SUCCESS;
 }
+static int usage_lf_tune(void) {
+    PrintAndLogEx(NORMAL, "Continuously measure LF antenna tuning at 125 kHz.");
+    PrintAndLogEx(NORMAL, "Press button or Enter to interrupt.");
+    PrintAndLogEx(NORMAL, "Usage:  lf tune [h] [<iter>]");
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(NORMAL, "Options:");
+    PrintAndLogEx(NORMAL, "       h             - This help");
+    PrintAndLogEx(NORMAL, "       <iter>        - number of iterations (default: 0=infinite)");
+    return PM3_SUCCESS;
+}
+
+int CmdLFTune(const char *Cmd) {
+    char cmdp = tolower(param_getchar(Cmd, 0));
+    if (cmdp == 'h') return usage_lf_tune();
+    int iter =  param_get32ex(Cmd, 0, 0, 10);
+
+    PrintAndLogEx(SUCCESS, "Measuring LF antenna at 125kHz, click button or press Enter to exit");
+
+    uint8_t mode[] = {1};
+    PacketResponseNG resp;
+
+    clearCommandBuffer();
+    SendCommandNG(CMD_MEASURE_ANTENNA_TUNING_LF, mode, sizeof(mode));
+    if (!WaitForResponseTimeout(CMD_MEASURE_ANTENNA_TUNING_LF, &resp, 1000)) {
+        PrintAndLogEx(WARNING, "Timeout while waiting for Proxmark LF initialization, aborting");
+        return PM3_ETIMEOUT;
+    }
+    mode[0] = 2;
+    // loop forever (till button pressed) if iter = 0 (default)
+    for (uint8_t i = 0; iter == 0 || i < iter; i++) {
+        if (kbd_enter_pressed()) { // abort by keyboard press
+            break;
+        }
+        SendCommandNG(CMD_MEASURE_ANTENNA_TUNING_LF, mode, sizeof(mode));
+        if (!WaitForResponseTimeout(CMD_MEASURE_ANTENNA_TUNING_LF, &resp, 1000)) {
+            PrintAndLogEx(WARNING, "Timeout while waiting for Proxmark LF measure, aborting");
+            return PM3_ETIMEOUT;
+        }
+        if ((resp.status == PM3_EOPABORTED) || (resp.length != sizeof(uint32_t)))
+            break;
+        uint32_t volt = resp.data.asDwords[0];
+        PrintAndLogEx(INPLACE, "%u mV / %5u V", volt, (uint32_t)(volt / 1000));
+    }
+    mode[0] = 3;
+    SendCommandNG(CMD_MEASURE_ANTENNA_TUNING_LF, mode, sizeof(mode));
+    if (!WaitForResponseTimeout(CMD_MEASURE_ANTENNA_TUNING_LF, &resp, 1000)) {
+        PrintAndLogEx(WARNING, "Timeout while waiting for Proxmark LF shutdown, aborting");
+        return PM3_ETIMEOUT;
+    }
+    PrintAndLogEx(NORMAL, "");
+    PrintAndLogEx(SUCCESS, "Done.");
+    return PM3_SUCCESS;
+}
 
 
 /* send a LF command before reading */
@@ -1166,6 +1219,7 @@ static command_t CommandTable[] = {
     {"simpsk",      CmdLFpskSim,        IfPm3Lf,         "[1|2|3] [c <clock>] [i] [r <carrier>] [d <raw hex to sim>] \n\t\t-- Simulate LF PSK tag from demodbuffer or input"},
     {"simbidir",    CmdLFSimBidir,      IfPm3Lf,         "Simulate LF tag (with bidirectional data transmission between reader and tag)"},
     {"sniff",       CmdLFSniff,         IfPm3Lf,         "Sniff LF traffic between reader and tag"},
+    {"tune",        CmdLFTune,          IfPm3Lf,         "Continuously measure LF antenna tuning"},
     {"vchdemod",    CmdVchDemod,        AlwaysAvailable, "['clone'] -- Demodulate samples for VeriChip"},
     {NULL, NULL, NULL, NULL}
 };

client/cmdlfawid.c

@@ -29,23 +29,18 @@
 #include "cmdlft55xx.h" // verifywrite
 
 static int CmdHelp(const char *Cmd);
-/*
+
-static int usage_lf_awid_read(void) {
+static int usage_lf_awid_watch(void) {
     PrintAndLogEx(NORMAL, "Enables AWID compatible reader mode printing details of scanned AWID26 or AWID50 tags.");
     PrintAndLogEx(NORMAL, "By default, values are printed and logged until the button is pressed or another USB command is issued.");
-    PrintAndLogEx(NORMAL, "If the [1] option is provided, reader mode is exited after reading a single AWID card.");
     PrintAndLogEx(NORMAL, "");
-    PrintAndLogEx(NORMAL, "Usage:  lf awid read [h] [1]");
+    PrintAndLogEx(NORMAL, "Usage:  lf awid watch");
-    PrintAndLogEx(NORMAL, "Options:");
-    PrintAndLogEx(NORMAL, "      h :  This help");
-    PrintAndLogEx(NORMAL, "      1 : (optional) stop after reading a single card");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Examples:");
-    PrintAndLogEx(NORMAL, "       lf awid read");
+    PrintAndLogEx(NORMAL, "       lf awid watch");
-    PrintAndLogEx(NORMAL, "       lf awid read 1");
     return PM3_SUCCESS;
 }
-*/
+
 static int usage_lf_awid_sim(void) {
     PrintAndLogEx(NORMAL, "Enables simulation of AWID card with specified facility-code and card number.");
     PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
@@ -180,27 +175,33 @@ static void verify_values(uint8_t *fmtlen, uint32_t *fc, uint32_t *cn) {
             break;
     }
 }
-/*
+
 // this read loops on device side.
 // uses the demod in lfops.c
-static int CmdAWIDRead_device(const char *Cmd) {
+static int CmdAWIDWatch(const char *Cmd) {
-
+    uint8_t ctmp = tolower(param_getchar(Cmd, 0));
-    if (Cmd[0] == 'h' || Cmd[0] == 'H') return usage_lf_awid_read();
+    if (ctmp == 'h') return usage_lf_awid_watch();
-    uint8_t findone = (Cmd[0] == '1') ? 1 : 0;
     clearCommandBuffer();
-    SendCommandMIX(CMD_LF_AWID_DEMOD, findone, 0, 0, NULL, 0);
+    SendCommandNG(CMD_LF_AWID_DEMOD, NULL, 0);
     return PM3_SUCCESS;
 }
-*/
+
 //by marshmellow
 //AWID Prox demod - FSK2a RF/50 with preamble of 00000001  (always a 96 bit data stream)
 //print full AWID Prox ID and some bit format details if found
 static int CmdAWIDDemod(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
-    uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
+
+    uint8_t *bits = calloc(MAX_GRAPH_TRACE_LEN, sizeof(uint8_t));
+    if (bits == NULL) {
+        PrintAndLogEx(DEBUG, "DEBUG: Error - AWID failed to allocate memory");
+        return PM3_EMALLOC;
+    }
+
     size_t size = getFromGraphBuf(bits);
     if (size == 0) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - AWID not enough samples");
+        free(bits);
         return PM3_ENODATA;
     }
     //get binary from fsk wave
@@ -221,6 +222,7 @@ static int CmdAWIDDemod(const char *Cmd) {
         else
             PrintAndLogEx(DEBUG, "DEBUG: Error - AWID error demoding fsk %d", idx);
 
+        free(bits);
         return PM3_ESOFT;
     }
 
@@ -249,6 +251,7 @@ static int CmdAWIDDemod(const char *Cmd) {
     size = removeParity(bits, idx + 8, 4, 1, 88);
     if (size != 66) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - AWID at parity check-tag size does not match AWID format");
+        free(bits);
         return PM3_ESOFT;
     }
     // ok valid card found!
@@ -318,6 +321,7 @@ static int CmdAWIDDemod(const char *Cmd) {
             }
             break;
     }
+    free(bits);
 
     PrintAndLogEx(DEBUG, "DEBUG: AWID idx: %d, Len: %d Printing Demod Buffer:", idx, size);
     if (g_debugMode)
@@ -557,6 +561,7 @@ static command_t CommandTable[] = {
     {"clone",   CmdAWIDClone,   IfPm3Lf,         "clone AWID to T55x7"},
     {"sim",     CmdAWIDSim,     IfPm3Lf,         "simulate AWID tag"},
     {"brute",   CmdAWIDBrute,   IfPm3Lf,         "Bruteforce card number against reader"},
+    {"watch",   CmdAWIDWatch,   IfPm3Lf,         "continuously watch for cards.  Reader mode"},
     {NULL, NULL, NULL, NULL}
 };
 

client/cmdlfem4x.c

@@ -690,39 +690,43 @@ static int CmdEM410xWrite(const char *Cmd) {
 }
 
 //**************** Start of EM4x50 Code ************************
-static bool EM_EndParityTest(uint8_t *bs, size_t size, uint8_t rows, uint8_t cols, uint8_t pType) {
+
+// even parity COLUMN
+static bool EM_ColParityTest(uint8_t *bs, size_t size, uint8_t rows, uint8_t cols, uint8_t pType) {
     if (rows * cols > size) return false;
     uint8_t colP = 0;
-    //assume last col is a parity and do not test
+
-    for (uint8_t colNum = 0; colNum < cols - 1; colNum++) {
+    for (uint8_t c = 0; c < cols - 1; c++) {
-        for (uint8_t rowNum = 0; rowNum < rows; rowNum++) {
+        for (uint8_t r = 0; r < rows; r++) {
-            colP ^= bs[(rowNum * cols) + colNum];
+            colP ^= bs[(r * cols) + c];
         }
         if (colP != pType) return false;
+        colP = 0;
     }
     return true;
 }
 
-static bool EM_ByteParityTest(uint8_t *bs, size_t size, uint8_t rows, uint8_t cols, uint8_t pType) {
+// even parity ROW 
+static bool EM_RowParityTest(uint8_t *bs, size_t size, uint8_t rows, uint8_t cols, uint8_t pType) {
     if (rows * cols > size) return false;
-
     uint8_t rowP = 0;
-    //assume last row is a parity row and do not test
+
-    for (uint8_t rowNum = 0; rowNum < rows - 1; rowNum++) {
+    for (uint8_t r = 0; r < rows - 1; r++) {
-        for (uint8_t colNum = 0; colNum < cols; colNum++) {
+        for (uint8_t c = 0; c < cols; c++) {
-            rowP ^= bs[(rowNum * cols) + colNum];
+            rowP ^= bs[(r * cols) + c];
         }
         if (rowP != pType) return false;
+        rowP = 0;
     }
     return true;
 }
 
 // EM word parity test.
 // 9*5 = 45 bits in total
+// 012345678|r0
 // 012345678|r1
 // 012345678|r2
 // 012345678|r3
-// 012345678|r4
 // ------------
 //c012345678| 0
 //            |- must be zero
@@ -795,7 +799,7 @@ static uint32_t OutputEM4x50_Block(uint8_t *BitStream, size_t size, bool verbose
  *  XXXXXXXX [row parity bit (even)] <- 8 bits plus parity
  *  XXXXXXXX [row parity bit (even)] <- 8 bits plus parity
  *  XXXXXXXX [row parity bit (even)] <- 8 bits plus parity
- *  CCCCCCCC                         <- column parity bits
+ *  CCCCCCC0                         <- column parity bits
  *  0                                <- stop bit
  *  LW                               <- Listen Window
  *
@@ -809,9 +813,8 @@ static uint32_t OutputEM4x50_Block(uint8_t *BitStream, size_t size, bool verbose
  */
 //completed by Marshmellow
 int EM4x50Read(const char *Cmd, bool verbose) {
-    uint8_t fndClk[] = {8, 16, 32, 40, 50, 64, 128};
     int clk = 0, invert = 0, tol = 0, phaseoff;
-    int i = 0, j = 0, startblock, skip, block, start, end, low = 0, high = 0, minClk = 255;
+    int i = 0, j = 0, startblock, skip, block, start, end, low = 0, high = 0;
     uint32_t Code[6];
     char tmp[6];
     char tmp2[20];
@@ -833,16 +836,27 @@ int EM4x50Read(const char *Cmd, bool verbose) {
 
     computeSignalProperties(bits, size);
 
-    signal_t *sp = getSignalProperties();
+    // get fuzzed HI / LOW limits in signal
-    high = sp->high;
+    getHiLo( &high, &low, 75, 75);
-    low = sp->low;
 
     // get to first full low to prime loop and skip incomplete first pulse
-    while ((i < size) && (bits[i] < high))
+    size_t offset = 0;
-        ++i;
+    getNextHigh(bits, size, high, &offset);
-    while ((i < size) && (bits[i] > low))
+    getNextLow(bits, size, low, &offset);
-        ++i;
+
-    skip = i;
+    i = (int)offset;
+    skip = offset;
+
+    // set clock
+    if (clk == 0) {
+        DetectASKClock(bits, size, &clk, 0);
+        if (clk == 0) {
+            if (verbose || g_debugMode) PrintAndLogEx(ERR, "Error: EM4x50 - didn't find a clock");
+                return PM3_ESOFT;
+        }
+    }
+    // tolerance
+    tol = clk / 8;
 
     // populate tmpbuff buffer with pulse lengths
     while (i < size) {
@@ -850,32 +864,18 @@ int EM4x50Read(const char *Cmd, bool verbose) {
         while ((i < size) && (bits[i] > low))
             ++i;
         start = i;
+
         while ((i < size) && (bits[i] < high))
             ++i;
+
         while ((i < size) && (bits[i] > low))
             ++i;
+
         if (j >= (MAX_GRAPH_TRACE_LEN / 64)) {
             break;
         }
         tmpbuff[j++] = i - start;
-        if (i - start < minClk && i < size) {
-            minClk = i - start;
     }
-    }
-    // set clock
-    if (!clk) {
-        for (uint8_t clkCnt = 0; clkCnt < 7; clkCnt++) {
-            tol = fndClk[clkCnt] / 8;
-            if (minClk >= fndClk[clkCnt] - tol && minClk <= fndClk[clkCnt] + 1) {
-                clk = fndClk[clkCnt];
-                break;
-            }
-        }
-        if (!clk) {
-            if (verbose || g_debugMode) PrintAndLogEx(ERR, "Error: EM4x50 - didn't find a clock");
-            return PM3_ESOFT;
-        }
-    } else tol = clk / 8;
 
     // look for data start - should be 2 pairs of LW (pulses of clk*3,clk*2)
     start = -1;
@@ -910,6 +910,7 @@ int EM4x50Read(const char *Cmd, bool verbose) {
                     }
     }
     end = i;
+
     // report back
     if (verbose || g_debugMode) {
         if (start >= 0) {
@@ -920,16 +921,23 @@ int EM4x50Read(const char *Cmd, bool verbose) {
             PrintAndLogEx(NORMAL, "  or after a " _YELLOW_("'data askedge'") " command to clean up the read");
             return PM3_ESOFT;
         }
-    } else if (start < 0) return PM3_ESOFT;
+    } else if (start < 0) {
+        return PM3_ESOFT;
+    }
 
     start = skip;
+
     snprintf(tmp2, sizeof(tmp2), "%d %d 1000 %d", clk, invert, clk * 47);
+
     // save GraphBuffer - to restore it later
     save_restoreGB(GRAPH_SAVE);
+
     // get rid of leading crap
     snprintf(tmp, sizeof(tmp), "%i", skip);
     CmdLtrim(tmp);
+
     bool AllPTest = true;
+
     // now work through remaining buffer printing out data blocks
     block = 0;
     i = startblock;
@@ -957,11 +965,12 @@ int EM4x50Read(const char *Cmd, bool verbose) {
             save_restoreGB(GRAPH_RESTORE);
             return PM3_ESOFT;
         }
+
         //set DemodBufferLen to just one block
         DemodBufferLen = skip / clk;
         //test parities
-        bool pTest = EM_ByteParityTest(DemodBuffer, DemodBufferLen, 5, 9, 0);
+        bool pTest = EM_RowParityTest(DemodBuffer, DemodBufferLen, 5, 9, 0);
-        pTest &= EM_EndParityTest(DemodBuffer, DemodBufferLen, 5, 9, 0);
+        pTest &= EM_ColParityTest(DemodBuffer, DemodBufferLen, 5, 9, 0);
         AllPTest &= pTest;
         //get output
         Code[block] = OutputEM4x50_Block(DemodBuffer, DemodBufferLen, verbose, pTest);
@@ -972,6 +981,7 @@ int EM4x50Read(const char *Cmd, bool verbose) {
         block++;
         if (i >= end) break; //in case chip doesn't output 6 blocks
     }
+
     //print full code:
     if (verbose || g_debugMode || AllPTest) {
         if (!complete) {
@@ -1128,6 +1138,20 @@ static bool detectASK_BI() {
     }
     return true;
 }
+static bool detectNRZ() {
+    int ans = NRZrawDemod("0 0 1", false);
+    if (ans != PM3_SUCCESS) {
+        PrintAndLogEx(DEBUG, "DEBUG: Error - EM: NRZ normal demod failed");
+
+        ans = NRZrawDemod("0 1 1", false);
+        if (ans != PM3_SUCCESS) {
+            PrintAndLogEx(DEBUG, "DEBUG: Error - EM: NRZ inverted demod failed");
+            return false;
+        }
+    }
+
+    return true;
+}
 
 // param: idx - start index in demoded data.
 static int setDemodBufferEM(uint32_t *word, size_t idx) {
@@ -1135,7 +1159,7 @@ static int setDemodBufferEM(uint32_t *word, size_t idx) {
     //test for even parity bits.
     uint8_t parity[45] = {0};
     memcpy(parity, DemodBuffer, 45);
-    if (!EM_EndParityTest(DemodBuffer + idx + EM_PREAMBLE_LEN, 45, 5, 9, 0)) {
+    if (!EM_ColParityTest(DemodBuffer + idx + EM_PREAMBLE_LEN, 45, 5, 9, 0)) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - End Parity check failed");
         return PM3_ESOFT;
     }
@@ -1150,7 +1174,7 @@ static int setDemodBufferEM(uint32_t *word, size_t idx) {
     return PM3_SUCCESS;
 }
 
-// FSK, PSK, ASK/MANCHESTER, ASK/BIPHASE, ASK/DIPHASE
+// FSK, PSK, ASK/MANCHESTER, ASK/BIPHASE, ASK/DIPHASE, NRZ
 // should cover 90% of known used configs
 // the rest will need to be manually demoded for now...
 static int demodEM4x05resp(uint32_t *word) {
@@ -1162,6 +1186,9 @@ static int demodEM4x05resp(uint32_t *word) {
     if (detectASK_BI() && doPreambleSearch(&idx))
         return setDemodBufferEM(word, idx);
 
+    if (detectNRZ() && doPreambleSearch(&idx))
+        return setDemodBufferEM(word, idx);
+
     if (detectFSK() && doPreambleSearch(&idx))
         return setDemodBufferEM(word, idx);
 
@@ -1203,6 +1230,13 @@ static int EM4x05ReadWord_ext(uint8_t addr, uint32_t pwd, bool usePwd, uint32_t
     return demodEM4x05resp(word);
 }
 
+static int CmdEM4x05Demod(const char *Cmd) {
+//    uint8_t ctmp = tolower(param_getchar(Cmd, 0));
+ //   if (ctmp == 'h') return usage_lf_em4x05_demod();
+    uint32_t word = 0;
+    return demodEM4x05resp(&word);
+}
+
 static int CmdEM4x05Dump(const char *Cmd) {
     uint8_t addr = 0;
     uint32_t pwd = 0;
@@ -1623,10 +1657,13 @@ static command_t CommandTable[] = {
     {"410x_watch",  CmdEM410xWatch,       IfPm3Lf,         "watches for EM410x 125/134 kHz tags (option 'h' for 134)"},
     {"410x_spoof",  CmdEM410xWatchnSpoof, IfPm3Lf,         "watches for EM410x 125/134 kHz tags, and replays them. (option 'h' for 134)" },
     {"410x_write",  CmdEM410xWrite,       IfPm3Lf,         "write EM410x UID to T5555(Q5) or T55x7 tag"},
+
+    {"4x05_demod",  CmdEM4x05Demod,       AlwaysAvailable, "demodulate a EM4x05/EM4x69 tag from the GraphBuffer"},
     {"4x05_dump",   CmdEM4x05Dump,        IfPm3Lf,         "dump EM4x05/EM4x69 tag"},
     {"4x05_info",   CmdEM4x05Info,        IfPm3Lf,         "tag information EM4x05/EM4x69"},
     {"4x05_read",   CmdEM4x05Read,        IfPm3Lf,         "read word data from EM4x05/EM4x69"},
     {"4x05_write",  CmdEM4x05Write,       IfPm3Lf,         "write word data to EM4x05/EM4x69"},
+
     {"4x50_demod",  CmdEM4x50Demod,       AlwaysAvailable, "demodulate a EM4x50 tag from the GraphBuffer"},
     {"4x50_dump",   CmdEM4x50Dump,        IfPm3Lf,         "dump EM4x50 tag"},
     {"4x50_read",   CmdEM4x50Read,        IfPm3Lf,         "read word data from EM4x50"},

client/cmdlfhid.c

@@ -47,9 +47,7 @@ static int usage_lf_hid_watch(void) {
     PrintAndLogEx(NORMAL, "Enables HID compatible reader mode printing details.");
     PrintAndLogEx(NORMAL, "By default, values are printed and logged until the button is pressed or another USB command is issued.");
     PrintAndLogEx(NORMAL, "");
-    PrintAndLogEx(NORMAL, "Usage:  lf hid watch [h]");
+    PrintAndLogEx(NORMAL, "Usage:  lf hid watch");
-    PrintAndLogEx(NORMAL, "Options:");
-    PrintAndLogEx(NORMAL, "      h :  This help");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Examples:");
     PrintAndLogEx(NORMAL, "       lf hid watch");
@@ -264,11 +262,10 @@ static int CmdHIDRead(const char *Cmd) {
 // this read loops on device side.
 // uses the demod in lfops.c
 static int CmdHIDWatch(const char *Cmd) {
-
     uint8_t ctmp = tolower(param_getchar(Cmd, 0));
-    if ( strlen(Cmd) == 0 || ctmp == 'h') return usage_lf_hid_watch();
+    if (ctmp == 'h') return usage_lf_hid_watch();
     clearCommandBuffer();
-    SendCommandMIX(CMD_LF_HID_DEMOD, 0, 0, 0, NULL, 0);
+    SendCommandNG(CMD_LF_HID_DEMOD, NULL, 0);
     return PM3_SUCCESS;
 }
 

client/cmdlfio.c

@@ -4,7 +4,7 @@
 // at your option, any later version. See the LICENSE.txt file for the text of
 // the license.
 //-----------------------------------------------------------------------------
-// Low frequency ioProx commands
+// Low frequency Kantech ioProx commands
 // FSK2a, rf/64, 64 bits (complete)
 //-----------------------------------------------------------------------------
 
@@ -27,23 +27,18 @@
 #include "cmdlft55xx.h" // verifywrite
 
 static int CmdHelp(const char *Cmd);
-/*
+
-static int usage_lf_io_read(void) {
+static int usage_lf_io_watch(void) {
     PrintAndLogEx(NORMAL, "Enables IOProx compatible reader mode printing details of scanned tags.");
     PrintAndLogEx(NORMAL, "By default, values are printed and logged until the button is pressed or another USB command is issued.");
-    PrintAndLogEx(NORMAL, "If the [1] option is provided, reader mode is exited after reading a single card.");
     PrintAndLogEx(NORMAL, "");
-    PrintAndLogEx(NORMAL, "Usage:  lf io read [h] [1]");
+    PrintAndLogEx(NORMAL, "Usage:  lf io watch");
-    PrintAndLogEx(NORMAL, "Options:");
-    PrintAndLogEx(NORMAL, "      h :  This help");
-    PrintAndLogEx(NORMAL, "      1 : (optional) stop after reading a single card");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Examples:");
-    PrintAndLogEx(NORMAL, "        lf io read");
+    PrintAndLogEx(NORMAL, "        lf io watch");
-    PrintAndLogEx(NORMAL, "        lf io read 1");
     return PM3_SUCCESS;
 }
-*/
+
 static int usage_lf_io_sim(void) {
     PrintAndLogEx(NORMAL, "Enables simulation of IOProx card with specified facility-code and card number.");
     PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
@@ -76,17 +71,17 @@ static int usage_lf_io_clone(void) {
     PrintAndLogEx(NORMAL, "       lf io clone 26 101 1337");
     return PM3_SUCCESS;
 }
-/*
+
 // this read loops on device side.
 // uses the demod in lfops.c
-static int CmdIOProxRead_device(const char *Cmd) {
+static int CmdIOProxWatch(const char *Cmd) {
-    if (Cmd[0] == 'h' || Cmd[0] == 'H') return usage_lf_io_read();
+    uint8_t ctmp = tolower(param_getchar(Cmd, 0));
-    int findone = (Cmd[0] == '1') ? 1 : 0;
+    if (ctmp == 'h') return usage_lf_io_watch();
     clearCommandBuffer();
-    SendCommandMIX(CMD_LF_IO_DEMOD, findone, 0, 0, NULL, 0);
+    SendCommandNG(CMD_LF_IO_DEMOD, NULL, 0);
     return PM3_SUCCESS;
 }
-*/
+
 //by marshmellow
 //IO-Prox demod - FSK RF/64 with preamble of 000000001
 //print ioprox ID and some format details
@@ -324,6 +319,7 @@ static command_t CommandTable[] = {
     {"read",    CmdIOProxRead,  IfPm3Lf,         "attempt to read and extract tag data"},
     {"clone",   CmdIOProxClone, IfPm3Lf,         "clone IOProx to T55x7"},
     {"sim",     CmdIOProxSim,   IfPm3Lf,         "simulate IOProx tag"},
+    {"watch",   CmdIOProxWatch, IfPm3Lf,         "continuously watch for cards. Reader mode"}, 
     {NULL, NULL, NULL, NULL}
 };
 
@@ -347,7 +343,7 @@ int demodIOProx(void) {
 //|           |           |           |           |           |           |
 //01234567 8 90123456 7 89012345 6 78901234 5 67890123 4 56789012 3 45678901 23
 //-----------------------------------------------------------------------------
-//00000000 0 11110000 1 facility 1 version* 1 code*one 1 code*two 1 ???????? 11
+//00000000 0 11110000 1 facility 1 version* 1 code*one 1 code*two 1   crc    11
 //XSF(version)facility:codeone+codetwo (raw)
 int getIOProxBits(uint8_t version, uint8_t fc, uint16_t cn, uint8_t *bits) {
 #define SEPARATOR 1

client/graph.c

@@ -8,13 +8,14 @@
 // Graph utilities
 //-----------------------------------------------------------------------------
 #include "graph.h"
-
+#include <stdlib.h>
 #include <string.h>
 #include "ui.h"
 #include "util.h"    //param_get32ex
 #include "lfdemod.h"
 #include "cmddata.h" //for g_debugmode
 
+
 int GraphBuffer[MAX_GRAPH_TRACE_LEN];
 size_t GraphTraceLen;
 int s_Buff[MAX_GRAPH_TRACE_LEN];
@@ -101,6 +102,7 @@ bool HasGraphData(void) {
     }
     return true;
 }
+
 bool isGraphBitstream(void) {
     // convert to bitstream if necessary
     for (int i = 0; i < GraphTraceLen; i++) {
@@ -110,9 +112,11 @@ bool isGraphBitstream(void) {
     }
     return true;
 }
+
 void convertGraphFromBitstream() {
     convertGraphFromBitstreamEx(1, 0);
 }
+
 void convertGraphFromBitstreamEx(int hi, int low) {
     for (int i = 0; i < GraphTraceLen; i++) {
         if (GraphBuffer[i] == hi)
@@ -122,29 +126,42 @@ void convertGraphFromBitstreamEx(int hi, int low) {
         else
             GraphBuffer[i] = 0;
     }
-    uint8_t bits[GraphTraceLen];
+
-    memset(bits, 0, sizeof(bits));
+    uint8_t *bits = calloc(GraphTraceLen, sizeof(uint8_t));
+    if (bits == NULL) {
+        PrintAndLogEx(DEBUG, "ERR: convertGraphFromBitstreamEx, failed to allocate memory");
+        return;
+    }
+
     size_t size = getFromGraphBuf(bits);
 
     // set signal properties low/high/mean/amplitude and is_noise detection
     computeSignalProperties(bits, size);
+    free(bits);
     RepaintGraphWindow();
 }
 
 // Get or auto-detect ask clock rate
 int GetAskClock(const char *str, bool printAns) {
     if (getSignalProperties()->isnoise)
-        return false;
+        return -1;
 
     int clock1 = param_get32ex(str, 0, 0, 10);
     if (clock1 > 0)
         return clock1;
 
     // Auto-detect clock
-    uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
+
+    uint8_t *bits = calloc(MAX_GRAPH_TRACE_LEN,  sizeof(uint8_t));
+    if (bits == NULL) {
+        PrintAndLogEx(WARNING, "Failed to allocate memory");
+        return -1;
+    }
+
     size_t size = getFromGraphBuf(bits);
     if (size == 0) {
         PrintAndLogEx(WARNING, "Failed to copy from graphbuffer");
+        free(bits);
         return -1;
     }
 
@@ -162,20 +179,29 @@ int GetAskClock(const char *str, bool printAns) {
     if (printAns || g_debugMode)
         PrintAndLogEx(SUCCESS, "Auto-detected clock rate: %d, Best Starting Position: %d", clock1, idx);
 
+    free(bits);
     return clock1;
 }
 
 uint8_t GetPskCarrier(const char *str, bool printAns) {
     if (getSignalProperties()->isnoise)
-        return false;
+        return -1;
 
     uint8_t carrier = 0;
-    uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
+
+    uint8_t *bits = calloc(MAX_GRAPH_TRACE_LEN,  sizeof(uint8_t));
+    if (bits == NULL) {
+        PrintAndLogEx(WARNING, "Failed to allocate memory");
+        return -1;
+    }
+
     size_t size = getFromGraphBuf(bits);
     if (size == 0) {
         PrintAndLogEx(WARNING, "Failed to copy from graphbuffer");
-        return 0;
+        free(bits);
+        return -1;
     }
+
     uint16_t fc = countFC(bits, size, false);
     carrier = fc & 0xFF;
     if (carrier != 2 && carrier != 4 && carrier != 8) return 0;
@@ -183,6 +209,8 @@ uint8_t GetPskCarrier(const char *str, bool printAns) {
     // Only print this message if we're not looping something
     if (printAns)
         PrintAndLogEx(SUCCESS, "Auto-detected PSK carrier rate: %d", carrier);
+
+    free(bits);
     return carrier;
 }
 
@@ -196,20 +224,28 @@ int GetPskClock(const char *str, bool printAns) {
         return clock1;
 
     // Auto-detect clock
-    uint8_t grph[MAX_GRAPH_TRACE_LEN] = {0};
+    uint8_t *bits = calloc(MAX_GRAPH_TRACE_LEN,  sizeof(uint8_t));
-    size_t size = getFromGraphBuf(grph);
+    if (bits == NULL) {
-    if (size == 0) {
+        PrintAndLogEx(WARNING, "Failed to allocate memory");
-        PrintAndLogEx(WARNING, "Failed to copy from graphbuffer");
         return -1;
     }
+
+    size_t size = getFromGraphBuf(bits);
+    if (size == 0) {
+        PrintAndLogEx(WARNING, "Failed to copy from graphbuffer");
+        free(bits);
+        return -1;
+    }
+
     size_t firstPhaseShiftLoc = 0;
     uint8_t curPhase = 0, fc = 0;
-    clock1 = DetectPSKClock(grph, size, 0, &firstPhaseShiftLoc, &curPhase, &fc);
+    clock1 = DetectPSKClock(bits, size, 0, &firstPhaseShiftLoc, &curPhase, &fc);
     setClockGrid(clock1, firstPhaseShiftLoc);
     // Only print this message if we're not looping something
     if (printAns)
         PrintAndLogEx(SUCCESS, "Auto-detected clock rate: %d", clock1);
 
+    free(bits);
     return clock1;
 }
 
@@ -223,21 +259,30 @@ int GetNrzClock(const char *str, bool printAns) {
         return clock1;
 
     // Auto-detect clock
-    uint8_t grph[MAX_GRAPH_TRACE_LEN] = {0};
+    uint8_t *bits = calloc(MAX_GRAPH_TRACE_LEN,  sizeof(uint8_t));
-    size_t size = getFromGraphBuf(grph);
+    if (bits == NULL) {
-    if (size == 0) {
+        PrintAndLogEx(WARNING, "Failed to allocate memory");
-        PrintAndLogEx(WARNING, "Failed to copy from graphbuffer");
         return -1;
     }
+
+    size_t size = getFromGraphBuf(bits);
+    if (size == 0) {
+        PrintAndLogEx(WARNING, "Failed to copy from graphbuffer");
+        free(bits);
+        return -1;
+    }
+
     size_t clkStartIdx = 0;
-    clock1 = DetectNRZClock(grph, size, 0, &clkStartIdx);
+    clock1 = DetectNRZClock(bits, size, 0, &clkStartIdx);
     setClockGrid(clock1, clkStartIdx);
     // Only print this message if we're not looping something
     if (printAns)
         PrintAndLogEx(SUCCESS, "Auto-detected clock rate: %d", clock1);
 
+    free(bits);
     return clock1;
 }
+
 //by marshmellow
 //attempt to detect the field clock and bit clock for FSK
 int GetFskClock(const char *str, bool printAns) {
@@ -249,12 +294,13 @@ int GetFskClock(const char *str, bool printAns) {
     uint8_t fc1 = 0, fc2 = 0, rf1 = 0;
     int firstClockEdge = 0;
 
-    if (!fskClocks(&fc1, &fc2, &rf1, &firstClockEdge))
+    if (fskClocks(&fc1, &fc2, &rf1, &firstClockEdge) == false)
         return 0;
 
     if ((fc1 == 10 && fc2 == 8) || (fc1 == 8 && fc2 == 5)) {
         if (printAns)
             PrintAndLogEx(SUCCESS, "Detected Field Clocks: FC/%d, FC/%d - Bit Clock: RF/%d", fc1, fc2, rf1);
+
         setClockGrid(rf1, firstClockEdge);
         return rf1;
     }
@@ -263,27 +309,41 @@ int GetFskClock(const char *str, bool printAns) {
     PrintAndLogEx(DEBUG, "Detected Field Clocks: FC/%d, FC/%d - Bit Clock: RF/%d", fc1, fc2, rf1);
     return 0;
 }
+
 bool fskClocks(uint8_t *fc1, uint8_t *fc2, uint8_t *rf1, int *firstClockEdge) {
 
     if (getSignalProperties()->isnoise)
         return false;
 
-    uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
+    uint8_t *bits = calloc(MAX_GRAPH_TRACE_LEN,  sizeof(uint8_t));
-    size_t size = getFromGraphBuf(bits);
+    if (bits == NULL) {
-    if (size == 0)
+        PrintAndLogEx(WARNING, "Failed to allocate memory");
         return false;
+    }
+
+    size_t size = getFromGraphBuf(bits);
+    if (size == 0) {
+        PrintAndLogEx(WARNING, "Failed to copy from graphbuffer");
+        free(bits);
+        return false;
+    }
 
     uint16_t ans = countFC(bits, size, true);
     if (ans == 0) {
         PrintAndLogEx(DEBUG, "DEBUG: No data found");
+        free(bits);
         return false;
     }
 
     *fc1 = (ans >> 8) & 0xFF;
     *fc2 = ans & 0xFF;
     *rf1 = detectFSKClk(bits, size, *fc1, *fc2, firstClockEdge);
+
+    free(bits);
+
     if (*rf1 == 0) {
         PrintAndLogEx(DEBUG, "DEBUG: Clock detect error");
+
         return false;
     }
     return true;

client/wiegand_formatutils.c

@@ -149,6 +149,8 @@ uint8_t get_length_from_header(wiegand_message_t *data) {
         hfmt >>= 1;
         len++;
     }
+    if (len < 26 )
+        len = 26;
     return len;
 }
 

common/lfdemod.c

@@ -38,11 +38,12 @@
 
 #include "lfdemod.h"
 #include <string.h>  // for memset, memcmp and size_t
+#include <stdlib.h>  // qsort
 #include "parity.h"  // for parity test
 #include "pm3_cmd.h" // error codes
-//**********************************************************************************************
+// **********************************************************************************************
-//---------------------------------Utilities Section--------------------------------------------
+// ---------------------------------Utilities Section--------------------------------------------
-//**********************************************************************************************
+// **********************************************************************************************
 #define LOWEST_DEFAULT_CLOCK 32
 #define FSK_PSK_THRESHOLD   123
 
@@ -81,18 +82,53 @@ static void printSignal(void) {
     prnt("  THRESHOLD noise amplitude......%d", NOISE_AMPLITUDE_THRESHOLD);
 }
 
+#ifndef ON_DEVICE
+static int cmp_uint8(const void *a, const void *b) {
+   if (*(const uint8_t *)a < * (const uint8_t *)b)
+       return -1;
+   else
+       return *(const uint8_t *)a > *(const uint8_t *)b;
+}
+#endif
+
 void computeSignalProperties(uint8_t *samples, uint32_t size) {
     resetSignal();
 
+    if (samples == NULL || size < SIGNAL_MIN_SAMPLES) return;
+
     uint32_t sum = 0;
-    for (uint32_t i = 0; i < size; i++) {
+    uint32_t offset_size = size - SIGNAL_IGNORE_FIRST_SAMPLES;
+
+#ifndef ON_DEVICE
+    uint8_t tmp[offset_size];
+    memcpy(tmp, samples + SIGNAL_IGNORE_FIRST_SAMPLES, sizeof(tmp));
+    qsort(tmp, sizeof(tmp), sizeof(uint8_t), cmp_uint8);
+
+    uint8_t low10 = 0.5 * (tmp[(int)(offset_size * 0.1)] + tmp[(int)((offset_size - 1) * 0.1)]);
+    uint8_t hi90 =  0.5 * (tmp[(int)(offset_size * 0.9)] + tmp[(int)((offset_size - 1) * 0.9)]);
+    uint32_t cnt = 0;
+    for (uint32_t i = SIGNAL_IGNORE_FIRST_SAMPLES; i < size; i++) {
+
+        if (samples[i] < signalprop.low) signalprop.low = samples[i];
+        if (samples[i] > signalprop.high) signalprop.high = samples[i];
+
+        if (samples[i] < low10 || samples[i] > hi90)
+            continue;
+
+        sum += samples[i];
+        cnt++;
+   }
+    signalprop.mean = sum / cnt;
+#else
+   for (uint32_t i =  SIGNAL_IGNORE_FIRST_SAMPLES; i < size; i++) {
         if (samples[i] < signalprop.low) signalprop.low = samples[i];
         if (samples[i] > signalprop.high) signalprop.high = samples[i];
         sum += samples[i];
     }
+    signalprop.mean = sum / offset_size;
+#endif
 
     // measure amplitude of signal
-    signalprop.mean = sum / size;
     signalprop.amplitude = signalprop.high - signalprop.mean;
     // By measuring mean and look at amplitude of signal from HIGH / LOW,
     // we can detect noise
@@ -106,9 +142,32 @@ void removeSignalOffset(uint8_t *samples, uint32_t size) {
     if (samples == NULL || size < SIGNAL_MIN_SAMPLES) return;
 
     int acc_off = 0;
+    uint32_t offset_size = size - SIGNAL_IGNORE_FIRST_SAMPLES;
+
+#ifndef ON_DEVICE
+
+    uint8_t tmp[offset_size];
+    memcpy(tmp, samples + SIGNAL_IGNORE_FIRST_SAMPLES, sizeof(tmp));
+    qsort(tmp, sizeof(tmp), sizeof(uint8_t), cmp_uint8);
+
+    uint8_t low10 = 0.5 * (tmp[(int)(offset_size * 0.05)] + tmp[(int)((offset_size - 1) * 0.05)]);
+    uint8_t hi90 =  0.5 * (tmp[(int)(offset_size * 0.95)] + tmp[(int)((offset_size - 1) * 0.95)]);
+    int32_t cnt = 0;
+    for (uint32_t i = SIGNAL_IGNORE_FIRST_SAMPLES; i < size; i++) {
+
+        if (samples[i] < low10 || samples[i] > hi90)
+            continue;
+
+        acc_off += samples[i] - 128;
+        cnt++;
+   }
+    acc_off /= cnt;
+#else
     for (uint32_t i = SIGNAL_IGNORE_FIRST_SAMPLES; i < size; i++)
         acc_off += samples[i] - 128;
-    acc_off /= (int)(size - SIGNAL_IGNORE_FIRST_SAMPLES);
+
+    acc_off /= (int)offset_size;
+#endif
 
     // shift and saturate samples to center the mean
     for (uint32_t i = 0; i < size; i++) {
@@ -265,13 +324,13 @@ bool preambleSearchEx(uint8_t *bits, uint8_t *preamble, size_t pLen, size_t *siz
             //first index found
             foundCnt++;
             if (foundCnt == 1) {
-                prnt("DEBUG: (preambleSearchEx) preamble found at %i", idx);
+                if (g_debugMode >= 1) prnt("DEBUG: (preambleSearchEx) preamble found at %i", idx);
                 *startIdx = idx;
                 if (findone)
                     return true;
             }
             if (foundCnt == 2) {
-                prnt("DEBUG: (preambleSearchEx) preamble 2 found at %i", idx);
+                if (g_debugMode >= 1) prnt("DEBUG: (preambleSearchEx) preamble 2 found at %i", idx);
                 *size = idx - *startIdx;
                 return true;
             }
@@ -479,9 +538,9 @@ bool DetectCleanAskWave(uint8_t *dest, size_t size, uint8_t high, uint8_t low) {
 }
 
 
-//**********************************************************************************************
+// **********************************************************************************************
-//-------------------Clock / Bitrate Detection Section------------------------------------------
+// -------------------Clock / Bitrate Detection Section------------------------------------------
-//**********************************************************************************************
+// **********************************************************************************************
 
 
 // by marshmellow
@@ -1176,9 +1235,9 @@ uint8_t detectFSKClk(uint8_t *bits, size_t size, uint8_t fcHigh, uint8_t fcLow,
 }
 
 
-//**********************************************************************************************
+// **********************************************************************************************
-//--------------------Modulation Demods &/or Decoding Section-----------------------------------
+// --------------------Modulation Demods &/or Decoding Section-----------------------------------
-//**********************************************************************************************
+// **********************************************************************************************
 
 
 // look for Sequence Terminator - should be pulses of clk*(1 or 2), clk*2, clk*(1.5 or 2), by idx we mean graph position index...
@@ -1985,9 +2044,9 @@ int pskRawDemod(uint8_t *dest, size_t *size, int *clock, int *invert) {
 }
 
 
-//**********************************************************************************************
+// **********************************************************************************************
-//-----------------Tag format detection section-------------------------------------------------
+// -----------------Tag format detection section-------------------------------------------------
-//**********************************************************************************************
+// **********************************************************************************************
 
 
 // by marshmellow

common/zlib/ChangeLog

@@ -1,19 +1,53 @@
 
                 ChangeLog file for zlib
 
-Changes in 1.2.8.f-Proxmark3 (for Proxmark3 project only) (26 May 2015)
+Changes in 1.2.11 (15 Jan 2017)
-- disable decoding of fixed code blocks in deflate (eliminates the need
+- Fix deflate stored bug when pulling last block from window
-  to store the fixed tree in RAM or ROM)
+- Permit immediate deflateParams changes before any deflate input
-- disable generating fixed code blocks in inflate  
+
-- look harder for local optimum of consecutive matches and single literals
+Changes in 1.2.10 (2 Jan 2017)
-  in inflate.
+- Avoid warnings on snprintf() return value
-- stripped down version - unnecessary files from original distribution
+- Fix bug in deflate_stored() for zero-length input
-  are not included
+- Fix bug in gzwrite.c that produced corrupt gzip files
+- Remove files to be installed before copying them in Makefile.in
+- Add warnings when compiling with assembler code
+
+Changes in 1.2.9 (31 Dec 2016)
+- Fix contrib/minizip to permit unzipping with desktop API [Zouzou]
+- Improve contrib/blast to return unused bytes
+- Assure that gzoffset() is correct when appending
+- Improve compress() and uncompress() to support large lengths
+- Fix bug in test/example.c where error code not saved
+- Remedy Coverity warning [Randers-Pehrson]
+- Improve speed of gzprintf() in transparent mode
+- Fix inflateInit2() bug when windowBits is 16 or 32
+- Change DEBUG macro to ZLIB_DEBUG
+- Avoid uninitialized access by gzclose_w()
+- Allow building zlib outside of the source directory
+- Fix bug that accepted invalid zlib header when windowBits is zero
+- Fix gzseek() problem on MinGW due to buggy _lseeki64 there
+- Loop on write() calls in gzwrite.c in case of non-blocking I/O
+- Add --warn (-w) option to ./configure for more compiler warnings
+- Reject a window size of 256 bytes if not using the zlib wrapper
+- Fix bug when level 0 used with Z_HUFFMAN or Z_RLE
+- Add --debug (-d) option to ./configure to define ZLIB_DEBUG
+- Fix bugs in creating a very large gzip header
+- Add uncompress2() function, which returns the input size used
+- Assure that deflateParams() will not switch functions mid-block
+- Dramatically speed up deflation for level 0 (storing)
+- Add gzfread(), duplicating the interface of fread()
+- Add gzfwrite(), duplicating the interface of fwrite()
+- Add deflateGetDictionary() function
+- Use snprintf() for later versions of Microsoft C
+- Fix *Init macros to use z_ prefix when requested
+- Replace as400 with os400 for OS/400 support [Monnerat]
+- Add crc32_z() and adler32_z() functions with size_t lengths
+- Update Visual Studio project files [AraHaan]
 
 Changes in 1.2.8 (28 Apr 2013)
 - Update contrib/minizip/iowin32.c for Windows RT [Vollant]
 - Do not force Z_CONST for C++
-- Clean up contrib/vstudio [Ro§]
+- Clean up contrib/vstudio [Roß]
 - Correct spelling error in zlib.h
 - Fix mixed line endings in contrib/vstudio
 
@@ -43,7 +77,7 @@ Changes in 1.2.7.1 (24 Mar 2013)
 - Clean up the usage of z_const and respect const usage within zlib
 - Clean up examples/gzlog.[ch] comparisons of different types
 - Avoid shift equal to bits in type (caused endless loop)
-- Fix unintialized value bug in gzputc() introduced by const patches
+- Fix uninitialized value bug in gzputc() introduced by const patches
 - Fix memory allocation error in examples/zran.c [Nor]
 - Fix bug where gzopen(), gzclose() would write an empty file
 - Fix bug in gzclose() when gzwrite() runs out of memory
@@ -203,7 +237,7 @@ Changes in 1.2.5.2 (17 Dec 2011)
 - Add a transparent write mode to gzopen() when 'T' is in the mode
 - Update python link in zlib man page
 - Get inffixed.h and MAKEFIXED result to match
-- Add a ./config --solo option to make zlib subset with no libary use
+- Add a ./config --solo option to make zlib subset with no library use
 - Add undocumented inflateResetKeep() function for CAB file decoding
 - Add --cover option to ./configure for gcc coverage testing
 - Add #define ZLIB_CONST option to use const in the z_stream interface
@@ -573,7 +607,7 @@ Changes in 1.2.3.1 (16 August 2006)
 - Update make_vms.com [Zinser]
 - Use -fPIC for shared build in configure [Teredesai, Nicholson]
 - Use only major version number for libz.so on IRIX and OSF1 [Reinholdtsen]
-- Use fdopen() (not _fdopen()) for Interix in zutil.h [BŠck]
+- Use fdopen() (not _fdopen()) for Interix in zutil.h [Bäck]
 - Add some FAQ entries about the contrib directory
 - Update the MVS question in the FAQ
 - Avoid extraneous reads after EOF in gzio.c [Brown]
@@ -1187,7 +1221,7 @@ Changes in 1.0.6 (19 Jan 1998)
         386 asm code replacing longest_match().
    contrib/iostream/ by Kevin Ruland <kevin@rodin.wustl.edu>
         A C++ I/O streams interface to the zlib gz* functions
-   contrib/iostream2/  by Tyge Løvset <Tyge.Lovset@cmr.no>
+   contrib/iostream2/  by Tyge Løvset <Tyge.Lovset@cmr.no>
         Another C++ I/O streams interface
    contrib/untgz/  by "Pedro A. Aranda Guti\irrez" <paag@tid.es>
         A very simple tar.gz file extractor using zlib
@@ -1276,7 +1310,7 @@ Changes in 1.0.1 (20 May 96) [1.0 skipped to avoid confusion]
 - fix array overlay in deflate.c which sometimes caused bad compressed data
 - fix inflate bug with empty stored block
 - fix MSDOS medium model which was broken in 0.99
-- fix deflateParams() which could generated bad compressed data.
+- fix deflateParams() which could generate bad compressed data.
 - Bytef is define'd instead of typedef'ed (work around Borland bug)
 - added an INDEX file
 - new makefiles for DJGPP (Makefile.dj2), 32-bit Borland (Makefile.b32),

common/zlib/README

@@ -1,15 +1,6 @@
-//-----------------------------------------------------------------------------
-// This version of zlib is modified for use within the Proxmark3 project. 
-// Files from the original distribution which are not required for this
-// purpose are not included. All modifications can easily be found
-// by searching for #ifdef ZLIB_PM3_TUNED and #ifndef ZLIB_PM3_TUNED.
-//
-// The rest of this file consists of the original README content
-//-----------------------------------------------------------------------------
-
 ZLIB DATA COMPRESSION LIBRARY
 
-zlib 1.2.8 is a general purpose data compression library.  All the code is
+zlib 1.2.11 is a general purpose data compression library.  All the code is
 thread safe.  The data format used by the zlib library is described by RFCs
 (Request for Comments) 1950 to 1952 in the files
 http://tools.ietf.org/html/rfc1950 (zlib format), rfc1951 (deflate format) and
@@ -40,7 +31,7 @@ Mark Nelson <markn@ieee.org> wrote an article about zlib for the Jan.  1997
 issue of Dr.  Dobb's Journal; a copy of the article is available at
 http://marknelson.us/1997/01/01/zlib-engine/ .
 
-The changes made in version 1.2.8 are documented in the file ChangeLog.
+The changes made in version 1.2.11 are documented in the file ChangeLog.
 
 Unsupported third party contributions are provided in directory contrib/ .
 
@@ -93,7 +84,7 @@ Acknowledgments:
 
 Copyright notice:
 
- (C) 1995-2013 Jean-loup Gailly and Mark Adler
+ (C) 1995-2017 Jean-loup Gailly and Mark Adler
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages

common/zlib/README_proxmark3

@@ -0,0 +1,63 @@
+This version of zlib is modified for use within the Proxmark3 project.
+Files from the original distribution which are not required for this
+purpose are not included. All modifications can easily be found
+by searching for #ifdef ZLIB_PM3_TUNED and #ifndef ZLIB_PM3_TUNED.
+
+Current zlib base version is 1.2.11
+
+ChangeLog for Proxmark3 project only
+------------------------------------
+
+Changes in 1.2.11.f-Proxmark3 (26 May 2015)
+- port 1.2.11 upstream changes to 1.2.8.f-Proxmark3
+
+Changes in 1.2.8.f-Proxmark3 (26 May 2015)
+- disable decoding of fixed code blocks in deflate (eliminates the need
+  to store the fixed tree in RAM or ROM)
+- disable generating fixed code blocks in inflate  
+- look harder for local optimum of consecutive matches and single literals
+  in inflate.
+- stripped down version - unnecessary files from original distribution
+  are not included
+
+Notes on porting 1.2.11 upstream changes to 1.2.8.f-Proxmark3
+-------------------------------------------------------------
+
+mkdir zlib-1.2.8-stripped
+for f in adler32.c ChangeLog deflate.c deflate.h FAQ inffast.c inffast.h inffixed.h inflate.c inflate.h inftrees.c inftrees.h README trees.c trees.h zconf.h zlib.h zutil.c zutil.h; do
+  cp zlib-1.2.8/$f zlib-1.2.8-stripped
+done
+# make style
+find zlib-1.2.8-stripped -name "*.[ch]" \
+    -exec perl -pi -e 's/[ \t]+$$//' {} \; \
+    -exec sh -c "tail -c1 {} | xxd -p | tail -1 | grep -q -v 0a$$" \; \
+    -exec sh -c "echo >> {}" \; \
+    -exec astyle --formatted --mode=c --suffix=none \
+    --indent=spaces=4 --indent-switches \
+    --keep-one-line-blocks --max-instatement-indent=60 \
+    --style=google --pad-oper --unpad-paren --pad-header \
+    --align-pointer=name {} \;
+diff -Naur zlib-1.2.8-stripped zlib > zlib-1.2.8-pm3.diff
+
+mkdir zlib-1.2.11-stripped
+for f in adler32.c ChangeLog deflate.c deflate.h FAQ inffast.c inffast.h inffixed.h inflate.c inflate.h inftrees.c inftrees.h README trees.c trees.h zconf.h zlib.h zutil.c zutil.h; do
+  cp zlib-1.2.11/$f zlib-1.2.11-stripped
+done
+# make style
+find zlib-1.2.11-stripped -name "*.[ch]" \
+    -exec perl -pi -e 's/[ \t]+$$//' {} \; \
+    -exec sh -c "tail -c1 {} | xxd -p | tail -1 | grep -q -v 0a$$" \; \
+    -exec sh -c "echo >> {}" \; \
+    -exec astyle --formatted --mode=c --suffix=none \
+    --indent=spaces=4 --indent-switches \
+    --keep-one-line-blocks --max-instatement-indent=60 \
+    --style=google --pad-oper --unpad-paren --pad-header \
+    --align-pointer=name {} \;
+
+diff -Naur zlib-1.2.8-stripped zlib-1.2.11-stripped > zlib-1.2.8-to-1.2.11.diff
+
+cd zlib
+patch -p1 < ../zlib-1.2.8-to-1.2.11.diff
+# fix .rej files manually...
+
+diff -Naur zlib-1.2.11-stripped zlib > zlib-1.2.11-pm3.diff

common/zlib/adler32.c

@@ -1,5 +1,5 @@
 /* adler32.c -- compute the Adler-32 checksum of a data stream
- * Copyright (C) 1995-2011 Mark Adler
+ * Copyright (C) 1995-2011, 2016 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -7,11 +7,9 @@
 
 #include "zutil.h"
 
-#define local static
-
 local uLong adler32_combine_ OF((uLong adler1, uLong adler2, z_off64_t len2));
 
-#define BASE 65521      /* largest prime smaller than 65536 */
+#define BASE 65521U     /* largest prime smaller than 65536 */
 #define NMAX 5552
 /* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */
 
@@ -62,10 +60,10 @@ local uLong adler32_combine_ OF((uLong adler1, uLong adler2, z_off64_t len2));
 #endif
 
 /* ========================================================================= */
-uLong ZEXPORT adler32(adler, buf, len)
+uLong ZEXPORT adler32_z(adler, buf, len)
 uLong adler;
 const Bytef *buf;
-uInt len;
+z_size_t len;
 {
     unsigned long sum2;
     unsigned n;
@@ -132,6 +130,15 @@ uInt len;
     return adler | (sum2 << 16);
 }
 
+/* ========================================================================= */
+uLong ZEXPORT adler32(adler, buf, len)
+uLong adler;
+const Bytef *buf;
+uInt len;
+{
+    return adler32_z(adler, buf, len);
+}
+
 /* ========================================================================= */
 local uLong adler32_combine_(adler1, adler2, len2)
 uLong adler1;
@@ -156,7 +163,7 @@ z_off64_t len2;
     sum2 += ((adler1 >> 16) & 0xffff) + ((adler2 >> 16) & 0xffff) + BASE - rem;
     if (sum1 >= BASE) sum1 -= BASE;
     if (sum1 >= BASE) sum1 -= BASE;
-    if (sum2 >= (BASE << 1)) sum2 -= (BASE << 1);
+    if (sum2 >= ((unsigned long)BASE << 1)) sum2 -= ((unsigned long)BASE << 1);
     if (sum2 >= BASE) sum2 -= BASE;
     return sum1 | (sum2 << 16);
 }
@@ -177,3 +184,4 @@ z_off64_t len2;
 {
     return adler32_combine_(adler1, adler2, len2);
 }
+

common/zlib/deflate.h

@@ -1,5 +1,5 @@
 /* deflate.h -- internal compression state
- * Copyright (C) 1995-2012 Jean-loup Gailly
+ * Copyright (C) 1995-2016 Jean-loup Gailly
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -51,13 +51,16 @@
 #define Buf_size 16
 /* size of bit buffer in bi_buf */
 
-#define INIT_STATE    42
+#define INIT_STATE    42    /* zlib header -> BUSY_STATE */
-#define EXTRA_STATE   69
+#ifdef GZIP
-#define NAME_STATE    73
+#  define GZIP_STATE  57    /* gzip header -> BUSY_STATE | EXTRA_STATE */
-#define COMMENT_STATE 91
+#endif
-#define HCRC_STATE   103
+#define EXTRA_STATE   69    /* gzip extra block -> NAME_STATE */
-#define BUSY_STATE   113
+#define NAME_STATE    73    /* gzip file name -> COMMENT_STATE */
-#define FINISH_STATE 666
+#define COMMENT_STATE 91    /* gzip comment -> HCRC_STATE */
+#define HCRC_STATE   103    /* gzip header CRC -> BUSY_STATE */
+#define BUSY_STATE   113    /* deflate -> FINISH_STATE */
+#define FINISH_STATE 666    /* stream complete */
 /* Stream status */
 
 
@@ -83,7 +86,7 @@ typedef struct static_tree_desc_s  static_tree_desc;
 typedef struct tree_desc_s {
     ct_data *dyn_tree;           /* the dynamic tree */
     int     max_code;            /* largest code with non zero frequency */
-    static_tree_desc *stat_desc; /* the corresponding static tree */
+    const static_tree_desc *stat_desc;  /* the corresponding static tree */
 } FAR tree_desc;
 
 typedef ush Pos;
@@ -100,10 +103,10 @@ typedef struct internal_state {
     Bytef *pending_buf;  /* output still pending */
     ulg   pending_buf_size; /* size of pending_buf */
     Bytef *pending_out;  /* next pending byte to output to the stream */
-    uInt   pending;      /* nb of bytes in the pending buffer */
+    ulg   pending;       /* nb of bytes in the pending buffer */
     int   wrap;          /* bit 0 true for zlib, bit 1 true for gzip */
     gz_headerp  gzhead;  /* gzip header information to write */
-    uInt   gzindex;      /* where in extra, name, or comment */
+    ulg   gzindex;       /* where in extra, name, or comment */
     Byte  method;        /* can only be DEFLATED */
     int   last_flush;    /* value of flush param for previous deflate call */
 
@@ -249,7 +252,7 @@ typedef struct internal_state {
     uInt matches;       /* number of string matches in current block */
     uInt insert;        /* bytes at end of window left to insert */
 
-#ifdef DEBUG
+#ifdef ZLIB_DEBUG
     ulg compressed_len; /* total bit length of compressed file mod 2^32 */
     ulg bits_sent;      /* bit length of compressed data sent mod 2^32 */
 #endif
@@ -275,7 +278,7 @@ typedef struct internal_state {
 /* Output a byte on the stream.
  * IN assertion: there is enough room in pending_buf.
  */
-#define put_byte(s, c) {s->pending_buf[s->pending++] = (c);}
+#define put_byte(s, c) {s->pending_buf[s->pending++] = (Bytef)(c);}
 
 
 #define MIN_LOOKAHEAD (MAX_MATCH+MIN_MATCH+1)
@@ -309,7 +312,7 @@ void ZLIB_INTERNAL _tr_stored_block OF((deflate_state *s, charf *buf,
  * used.
  */
 
-#ifndef DEBUG
+#ifndef ZLIB_DEBUG
 /* Inline versions of _tr_tally for speed: */
 
 #if defined(GEN_TREES_H) || !defined(STDC)
@@ -328,8 +331,8 @@ extern const uch ZLIB_INTERNAL _dist_code[];
     flush = (s->last_lit == s->lit_bufsize-1); \
    }
 # define _tr_tally_dist(s, distance, length, flush) \
-    { uch len = (length); \
+  { uch len = (uch)(length); \
-        ush dist = (distance); \
+    ush dist = (ush)(distance); \
     s->d_buf[s->last_lit] = dist; \
     s->l_buf[s->last_lit++] = len; \
     dist--; \
@@ -344,3 +347,4 @@ extern const uch ZLIB_INTERNAL _dist_code[];
 #endif
 
 #endif /* DEFLATE_H */
+

common/zlib/inffast.c

@@ -1,5 +1,5 @@
 /* inffast.c -- fast decoding
- * Copyright (C) 1995-2008, 2010, 2013 Mark Adler
+ * Copyright (C) 1995-2017 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -8,26 +8,9 @@
 #include "inflate.h"
 #include "inffast.h"
 
-#ifndef ASMINF
+#ifdef ASMINF
-
+#  pragma message("Assembler code may have bugs -- use at your own risk")
-/* Allow machine dependent optimization for post-increment or pre-increment.
-   Based on testing to date,
-   Pre-increment preferred for:
-   - PowerPC G3 (Adler)
-   - MIPS R5000 (Randers-Pehrson)
-   Post-increment preferred for:
-   - none
-   No measurable difference:
-   - Pentium III (Anderson)
-   - M68060 (Nikl)
- */
-#ifdef POSTINC
-#  define OFF 0
-#  define PUP(a) *(a)++
 #else
-#  define OFF 1
-#  define PUP(a) *++(a)
-#endif
 
 /*
    Decode literal, length, and distance codes and write out the resulting
@@ -96,9 +79,9 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
 
     /* copy state to local variables */
     state = (struct inflate_state FAR *)strm->state;
-    in = strm->next_in - OFF;
+    in = strm->next_in;
     last = in + (strm->avail_in - 5);
-    out = strm->next_out - OFF;
+    out = strm->next_out;
     beg = out - (start - strm->avail_out);
     end = out + (strm->avail_out - 257);
 #ifdef INFLATE_STRICT
@@ -119,9 +102,9 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
        input data or output space */
     do {
         if (bits < 15) {
-            hold += (unsigned long)(PUP(in)) << bits;
+            hold += (unsigned long)(*in++) << bits;
             bits += 8;
-            hold += (unsigned long)(PUP(in)) << bits;
+            hold += (unsigned long)(*in++) << bits;
             bits += 8;
         }
         here = lcode[hold & lmask];
@@ -134,13 +117,13 @@ dolen:
             Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?
                      "inflate:         literal '%c'\n" :
                      "inflate:         literal 0x%02x\n", here.val));
-            PUP(out) = (unsigned char)(here.val);
+            *out++ = (unsigned char)(here.val);
         } else if (op & 16) {                   /* length base */
             len = (unsigned)(here.val);
             op &= 15;                           /* number of extra bits */
             if (op) {
                 if (bits < op) {
-                    hold += (unsigned long)(PUP(in)) << bits;
+                    hold += (unsigned long)(*in++) << bits;
                     bits += 8;
                 }
                 len += (unsigned)hold & ((1U << op) - 1);
@@ -149,9 +132,9 @@ dolen:
             }
             Tracevv((stderr, "inflate:         length %u\n", len));
             if (bits < 15) {
-                hold += (unsigned long)(PUP(in)) << bits;
+                hold += (unsigned long)(*in++) << bits;
                 bits += 8;
-                hold += (unsigned long)(PUP(in)) << bits;
+                hold += (unsigned long)(*in++) << bits;
                 bits += 8;
             }
             here = dcode[hold & dmask];
@@ -164,10 +147,10 @@ dodist:
                 dist = (unsigned)(here.val);
                 op &= 15;                       /* number of extra bits */
                 if (bits < op) {
-                    hold += (unsigned long)(PUP(in)) << bits;
+                    hold += (unsigned long)(*in++) << bits;
                     bits += 8;
                     if (bits < op) {
-                        hold += (unsigned long)(PUP(in)) << bits;
+                        hold += (unsigned long)(*in++) << bits;
                         bits += 8;
                     }
                 }
@@ -195,30 +178,30 @@ dodist:
 #ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
                         if (len <= op - whave) {
                             do {
-                                PUP(out) = 0;
+                                *out++ = 0;
                             } while (--len);
                             continue;
                         }
                         len -= op - whave;
                         do {
-                            PUP(out) = 0;
+                            *out++ = 0;
                         } while (--op > whave);
                         if (op == 0) {
                             from = out - dist;
                             do {
-                                PUP(out) = PUP(from);
+                                *out++ = *from++;
                             } while (--len);
                             continue;
                         }
 #endif
                     }
-                    from = window - OFF;
+                    from = window;
                     if (wnext == 0) {           /* very common case */
                         from += wsize - op;
                         if (op < len) {         /* some from window */
                             len -= op;
                             do {
-                                PUP(out) = PUP(from);
+                                *out++ = *from++;
                             } while (--op);
                             from = out - dist;  /* rest from output */
                         }
@@ -228,14 +211,14 @@ dodist:
                         if (op < len) {         /* some from end of window */
                             len -= op;
                             do {
-                                PUP(out) = PUP(from);
+                                *out++ = *from++;
                             } while (--op);
-                            from = window - OFF;
+                            from = window;
                             if (wnext < len) {  /* some from start of window */
                                 op = wnext;
                                 len -= op;
                                 do {
-                                    PUP(out) = PUP(from);
+                                    *out++ = *from++;
                                 } while (--op);
                                 from = out - dist;      /* rest from output */
                             }
@@ -245,34 +228,34 @@ dodist:
                         if (op < len) {         /* some from window */
                             len -= op;
                             do {
-                                PUP(out) = PUP(from);
+                                *out++ = *from++;
                             } while (--op);
                             from = out - dist;  /* rest from output */
                         }
                     }
                     while (len > 2) {
-                        PUP(out) = PUP(from);
+                        *out++ = *from++;
-                        PUP(out) = PUP(from);
+                        *out++ = *from++;
-                        PUP(out) = PUP(from);
+                        *out++ = *from++;
                         len -= 3;
                     }
                     if (len) {
-                        PUP(out) = PUP(from);
+                        *out++ = *from++;
                         if (len > 1)
-                            PUP(out) = PUP(from);
+                            *out++ = *from++;
                     }
                 } else {
                     from = out - dist;          /* copy direct from output */
                     do {                        /* minimum length is three */
-                        PUP(out) = PUP(from);
+                        *out++ = *from++;
-                        PUP(out) = PUP(from);
+                        *out++ = *from++;
-                        PUP(out) = PUP(from);
+                        *out++ = *from++;
                         len -= 3;
                     } while (len > 2);
                     if (len) {
-                        PUP(out) = PUP(from);
+                        *out++ = *from++;
                         if (len > 1)
-                            PUP(out) = PUP(from);
+                            *out++ = *from++;
                     }
                 }
             } else if ((op & 64) == 0) {        /* 2nd level distance code */
@@ -304,8 +287,8 @@ dodist:
     hold &= (1U << bits) - 1;
 
     /* update state and return */
-    strm->next_in = in + OFF;
+    strm->next_in = in;
-    strm->next_out = out + OFF;
+    strm->next_out = out;
     strm->avail_in = (unsigned)(in < last ? 5 + (last - in) : 5 - (in - last));
     strm->avail_out = (unsigned)(out < end ?
                                  257 + (end - out) : 257 - (out - end));
@@ -329,3 +312,4 @@ dodist:
  */
 
 #endif /* !ASMINF */
+

common/zlib/inffast.h

@@ -9,3 +9,4 @@
  */
 
 void ZLIB_INTERNAL inflate_fast OF((z_streamp strm, unsigned start));
+

common/zlib/inffixed.h

@@ -92,3 +92,4 @@ static const code distfix[32] = {
     {16, 5, 4}, {24, 5, 769}, {20, 5, 49}, {28, 5, 12289}, {18, 5, 13}, {26, 5, 3073},
     {22, 5, 193}, {64, 5, 0}
 };
+

common/zlib/inflate.c

@@ -1,5 +1,5 @@
 /* inflate.c -- zlib decompression
- * Copyright (C) 1995-2012 Mark Adler
+ * Copyright (C) 1995-2016 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -80,15 +80,6 @@
  * The history for versions after 1.2.0 are in ChangeLog in zlib distribution.
  */
 
-//-----------------------------------------------------------------------------
-// This version of zlib is modified for use within the Proxmark3 project.
-// Files from the original distribution which are not required for this
-// purpose are not included. All modifications can easily be found
-// by searching for #ifdef ZLIB_PM3_TUNED and #ifndef ZLIB_PM3_TUNED.
-//-----------------------------------------------------------------------------
-
-
-
 #include "zutil.h"
 #include "inftrees.h"
 #include "inflate.h"
@@ -101,6 +92,7 @@
 #endif
 
 /* function prototypes */
+local int inflateStateCheck OF((z_streamp strm));
 #ifdef ZLIB_PM3_TUNED
 extern void Dbprintf(const char *fmt, ...);
 #else
@@ -114,12 +106,26 @@ void makefixed OF((void));
 local unsigned syncsearch OF((unsigned FAR *have, const unsigned char FAR *buf,
                               unsigned len));
 
+local int inflateStateCheck(strm)
+z_streamp strm;
+{
+    struct inflate_state FAR *state;
+    if (strm == Z_NULL ||
+            strm->zalloc == (alloc_func)0 || strm->zfree == (free_func)0)
+        return 1;
+    state = (struct inflate_state FAR *)strm->state;
+    if (state == Z_NULL || state->strm != strm ||
+            state->mode < HEAD || state->mode > SYNC)
+        return 1;
+    return 0;
+}
+
 int ZEXPORT inflateResetKeep(strm)
 z_streamp strm;
 {
     struct inflate_state FAR *state;
 
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
     state = (struct inflate_state FAR *)strm->state;
     strm->total_in = strm->total_out = state->total = 0;
     strm->msg = Z_NULL;
@@ -144,7 +150,7 @@ z_streamp strm;
 {
     struct inflate_state FAR *state;
 
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
     state = (struct inflate_state FAR *)strm->state;
     state->wsize = 0;
     state->whave = 0;
@@ -160,7 +166,7 @@ int windowBits;
     struct inflate_state FAR *state;
 
     /* get the state */
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
     state = (struct inflate_state FAR *)strm->state;
 
     /* extract wrap request from windowBits parameter */
@@ -168,7 +174,7 @@ int windowBits;
         wrap = 0;
         windowBits = -windowBits;
     } else {
-        wrap = (windowBits >> 4) + 1;
+        wrap = (windowBits >> 4) + 5;
 #ifdef GUNZIP
         if (windowBits < 48)
             windowBits &= 15;
@@ -222,7 +228,9 @@ int stream_size;
     if (state == Z_NULL) return Z_MEM_ERROR;
     Tracev((stderr, "inflate: allocated\n"));
     strm->state = (struct internal_state FAR *)state;
+    state->strm = strm;
     state->window = Z_NULL;
+    state->mode = HEAD;     /* to pass state test in inflateReset2() */
     ret = inflateReset2(strm, windowBits);
     if (ret != Z_OK) {
         ZFREE(strm, state);
@@ -246,17 +254,17 @@ int value;
 {
     struct inflate_state FAR *state;
 
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
     state = (struct inflate_state FAR *)strm->state;
     if (bits < 0) {
         state->hold = 0;
         state->bits = 0;
         return Z_OK;
     }
-    if (bits > 16 || state->bits + bits > 32) return Z_STREAM_ERROR;
+    if (bits > 16 || state->bits + (uInt)bits > 32) return Z_STREAM_ERROR;
     value &= (1L << bits) - 1;
-    state->hold += value << state->bits;
+    state->hold += (unsigned)value << state->bits;
-    state->bits += bits;
+    state->bits += (uInt)bits;
     return Z_OK;
 }
 
@@ -635,7 +643,7 @@ int flush;
     static const unsigned short order[19] = /* permutation of code lengths */
     {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
 
-    if (strm == Z_NULL || strm->state == Z_NULL || strm->next_out == Z_NULL ||
+    if (inflateStateCheck(strm) || strm->next_out == Z_NULL ||
             (strm->next_in == Z_NULL && strm->avail_in != 0))
         return Z_STREAM_ERROR;
 
@@ -655,6 +663,8 @@ int flush;
                 NEEDBITS(16);
 #ifdef GUNZIP
                 if ((state->wrap & 2) && hold == 0x8b1f) {  /* gzip header */
+                    if (state->wbits == 0)
+                        state->wbits = 15;
                     state->check = crc32(0L, Z_NULL, 0);
                     CRC2(state->check, hold);
                     INITBITS();
@@ -682,7 +692,7 @@ int flush;
                 len = BITS(4) + 8;
                 if (state->wbits == 0)
                     state->wbits = len;
-                else if (len > state->wbits) {
+                if (len > 15 || len > state->wbits) {
                     strm->msg = (char *)"invalid window size";
                     state->mode = BAD;
                     break;
@@ -709,14 +719,16 @@ int flush;
                 }
                 if (state->head != Z_NULL)
                     state->head->text = (int)((hold >> 8) & 1);
-                if (state->flags & 0x0200) CRC2(state->check, hold);
+                if ((state->flags & 0x0200) && (state->wrap & 4))
+                    CRC2(state->check, hold);
                 INITBITS();
                 state->mode = TIME;
             case TIME:
                 NEEDBITS(32);
                 if (state->head != Z_NULL)
                     state->head->time = hold;
-                if (state->flags & 0x0200) CRC4(state->check, hold);
+                if ((state->flags & 0x0200) && (state->wrap & 4))
+                    CRC4(state->check, hold);
                 INITBITS();
                 state->mode = OS;
             case OS:
@@ -725,7 +737,8 @@ int flush;
                     state->head->xflags = (int)(hold & 0xff);
                     state->head->os = (int)(hold >> 8);
                 }
-                if (state->flags & 0x0200) CRC2(state->check, hold);
+                if ((state->flags & 0x0200) && (state->wrap & 4))
+                    CRC2(state->check, hold);
                 INITBITS();
                 state->mode = EXLEN;
             case EXLEN:
@@ -734,7 +747,8 @@ int flush;
                     state->length = (unsigned)(hold);
                     if (state->head != Z_NULL)
                         state->head->extra_len = (unsigned)hold;
-                    if (state->flags & 0x0200) CRC2(state->check, hold);
+                    if ((state->flags & 0x0200) && (state->wrap & 4))
+                        CRC2(state->check, hold);
                     INITBITS();
                 } else if (state->head != Z_NULL)
                     state->head->extra = Z_NULL;
@@ -751,7 +765,7 @@ int flush;
                                     len + copy > state->head->extra_max ?
                                     state->head->extra_max - len : copy);
                         }
-                        if (state->flags & 0x0200)
+                        if ((state->flags & 0x0200) && (state->wrap & 4))
                             state->check = crc32(state->check, next, copy);
                         have -= copy;
                         next += copy;
@@ -770,9 +784,9 @@ int flush;
                         if (state->head != Z_NULL &&
                                 state->head->name != Z_NULL &&
                                 state->length < state->head->name_max)
-                            state->head->name[state->length++] = len;
+                            state->head->name[state->length++] = (Bytef)len;
                     } while (len && copy < have);
-                    if (state->flags & 0x0200)
+                    if ((state->flags & 0x0200) && (state->wrap & 4))
                         state->check = crc32(state->check, next, copy);
                     have -= copy;
                     next += copy;
@@ -790,9 +804,9 @@ int flush;
                         if (state->head != Z_NULL &&
                                 state->head->comment != Z_NULL &&
                                 state->length < state->head->comm_max)
-                            state->head->comment[state->length++] = len;
+                            state->head->comment[state->length++] = (Bytef)len;
                     } while (len && copy < have);
-                    if (state->flags & 0x0200)
+                    if ((state->flags & 0x0200) && (state->wrap & 4))
                         state->check = crc32(state->check, next, copy);
                     have -= copy;
                     next += copy;
@@ -803,7 +817,7 @@ int flush;
             case HCRC:
                 if (state->flags & 0x0200) {
                     NEEDBITS(16);
-                    if (hold != (state->check & 0xffff)) {
+                    if ((state->wrap & 4) && hold != (state->check & 0xffff)) {
                         strm->msg = (char *)"header crc mismatch";
                         state->mode = BAD;
                         break;
@@ -1184,11 +1198,11 @@ int flush;
                     out -= left;
                     strm->total_out += out;
                     state->total += out;
-                    if (out)
+                    if ((state->wrap & 4) && out)
                         strm->adler = state->check =
                                           UPDATE(state->check, put - out, out);
                     out = left;
-                    if ((
+                    if ((state->wrap & 4) && (
 #ifdef GUNZIP
                                 state->flags ? hold :
 #endif
@@ -1247,10 +1261,10 @@ inf_leave:
     strm->total_in += in;
     strm->total_out += out;
     state->total += out;
-    if (state->wrap && out)
+    if ((state->wrap & 4) && out)
         strm->adler = state->check =
                           UPDATE(state->check, strm->next_out - out, out);
-    strm->data_type = state->bits + (state->last ? 64 : 0) +
+    strm->data_type = (int)state->bits + (state->last ? 64 : 0) +
                       (state->mode == TYPE ? 128 : 0) +
                       (state->mode == LEN_ || state->mode == COPY_ ? 256 : 0);
     if (((in == 0 && out == 0) || flush == Z_FINISH) && ret == Z_OK)
@@ -1262,7 +1276,7 @@ int ZEXPORT inflateEnd(strm)
 z_streamp strm;
 {
     struct inflate_state FAR *state;
-    if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0)
+    if (inflateStateCheck(strm))
         return Z_STREAM_ERROR;
     state = (struct inflate_state FAR *)strm->state;
     if (state->window != Z_NULL) ZFREE(strm, state->window);
@@ -1280,7 +1294,7 @@ uInt *dictLength;
     struct inflate_state FAR *state;
 
     /* check state */
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
     state = (struct inflate_state FAR *)strm->state;
 
     /* copy dictionary */
@@ -1305,7 +1319,7 @@ uInt dictLength;
     int ret;
 
     /* check state */
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
     state = (struct inflate_state FAR *)strm->state;
     if (state->wrap != 0 && state->mode != DICT)
         return Z_STREAM_ERROR;
@@ -1337,7 +1351,7 @@ gz_headerp head;
     struct inflate_state FAR *state;
 
     /* check state */
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
     state = (struct inflate_state FAR *)strm->state;
     if ((state->wrap & 2) == 0) return Z_STREAM_ERROR;
 
@@ -1390,7 +1404,7 @@ z_streamp strm;
     struct inflate_state FAR *state;
 
     /* check parameters */
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
     state = (struct inflate_state FAR *)strm->state;
     if (strm->avail_in == 0 && state->bits < 8) return Z_BUF_ERROR;
 
@@ -1439,7 +1453,7 @@ z_streamp strm;
 {
     struct inflate_state FAR *state;
 
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
     state = (struct inflate_state FAR *)strm->state;
     return state->mode == STORED && state->bits == 0;
 }
@@ -1454,8 +1468,7 @@ z_streamp source;
     unsigned wsize;
 
     /* check input */
-    if (dest == Z_NULL || source == Z_NULL || source->state == Z_NULL ||
+    if (inflateStateCheck(source) || dest == Z_NULL)
-            source->zalloc == (alloc_func)0 || source->zfree == (free_func)0)
         return Z_STREAM_ERROR;
     state = (struct inflate_state FAR *)source->state;
 
@@ -1476,6 +1489,7 @@ z_streamp source;
     /* copy state */
     zmemcpy((voidpf)dest, (voidpf)source, sizeof(z_stream));
     zmemcpy((voidpf)copy, (voidpf)state, sizeof(struct inflate_state));
+    copy->strm = dest;
     if (state->lencode >= state->codes &&
             state->lencode <= state->codes + ENOUGH - 1) {
         copy->lencode = copy->codes + (state->lencode - state->codes);
@@ -1497,26 +1511,51 @@ int subvert;
 {
     struct inflate_state FAR *state;
 
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
     state = (struct inflate_state FAR *)strm->state;
 #ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
     state->sane = !subvert;
     return Z_OK;
 #else
+    (void)subvert;
     state->sane = 1;
     return Z_DATA_ERROR;
 #endif
 }
 
+int ZEXPORT inflateValidate(strm, check)
+z_streamp strm;
+int check;
+{
+    struct inflate_state FAR *state;
+
+    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    if (check)
+        state->wrap |= 4;
+    else
+        state->wrap &= ~4;
+    return Z_OK;
+}
+
 long ZEXPORT inflateMark(strm)
 z_streamp strm;
 {
     struct inflate_state FAR *state;
 
-    if (strm == Z_NULL || strm->state == Z_NULL)
+    if (inflateStateCheck(strm))
-        return ~0UL << 16;
+        return -(1L << 16);
     state = (struct inflate_state FAR *)strm->state;
-    return ((long)(state->back) << 16) +
+    return (long)(((unsigned long)((long)state->back)) << 16) +
            (state->mode == COPY ? state->length :
             (state->mode == MATCH ? state->was - state->length : 0));
 }
+
+unsigned long ZEXPORT inflateCodesUsed(strm)
+z_streamp strm;
+{
+    struct inflate_state FAR *state;
+    if (inflateStateCheck(strm)) return (unsigned long) -1;
+    state = (struct inflate_state FAR *)strm->state;
+    return (unsigned long)(state->next - state->codes);
+}

common/zlib/inflate.h

@@ -1,5 +1,5 @@
 /* inflate.h -- internal inflate state definition
- * Copyright (C) 1995-2009 Mark Adler
+ * Copyright (C) 1995-2016 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -18,7 +18,7 @@
 
 /* Possible inflate modes between inflate() calls */
 typedef enum {
-    HEAD,       /* i: waiting for magic header */
+    HEAD = 16180,   /* i: waiting for magic header */
     FLAGS,      /* i: waiting for method and flags (gzip) */
     TIME,       /* i: waiting for modification time (gzip) */
     OS,         /* i: waiting for extra flags and operating system (gzip) */
@@ -77,11 +77,14 @@ typedef enum {
         CHECK -> LENGTH -> DONE
  */
 
-/* state maintained between inflate() calls.  Approximately 10K bytes. */
+/* State maintained between inflate() calls -- approximately 7K bytes, not
+   including the allocated sliding window, which is up to 32K bytes. */
 struct inflate_state {
+    z_streamp strm;             /* pointer back to this zlib stream */
     inflate_mode mode;          /* current inflate mode */
     int last;                   /* true if processing last block */
-    int wrap;                   /* bit 0 true for zlib, bit 1 true for gzip */
+    int wrap;                   /* bit 0 true for zlib, bit 1 true for gzip,
+                                   bit 2 true to validate check value */
     int havedict;               /* true if dictionary provided */
     int flags;                  /* gzip header method and flags (0 if zlib) */
     unsigned dmax;              /* zlib header max distance (INFLATE_STRICT) */
@@ -120,3 +123,4 @@ struct inflate_state {
     int back;                   /* bits back of last unprocessed length/lit */
     unsigned was;               /* initial length of match */
 };
+

common/zlib/inftrees.c

@@ -1,5 +1,5 @@
 /* inftrees.c -- generate Huffman trees for efficient decoding
- * Copyright (C) 1995-2013 Mark Adler
+ * Copyright (C) 1995-2017 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -9,7 +9,11 @@
 #define MAXBITS 15
 
 const char inflate_copyright[] =
-    " inflate 1.2.8.f-Proxmark3 Copyright 1995-2013 Mark Adler ";
+#ifdef ZLIB_PM3_TUNED
+    " inflate 1.2.11.f-Proxmark3 Copyright 1995-2017 Mark Adler ";
+#else
+    " inflate 1.2.11 Copyright 1995-2017 Mark Adler ";
+#endif
 /*
   If you use the zlib library in a product, an acknowledgment is welcome
   in the documentation of your product. If for some reason you cannot
@@ -49,7 +53,7 @@ int ZLIB_INTERNAL inflate_table(codetype type, unsigned short FAR *lens,
     code FAR *next;             /* next available space in table */
     const unsigned short FAR *base;     /* base value table to use */
     const unsigned short FAR *extra;    /* extra bits table to use */
-    int end;                    /* use base and extra for symbol > end */
+    unsigned match;             /* use base and extra for symbol >= match */
     unsigned short count[MAXBITS + 1];  /* number of codes of each length */
     unsigned short offs[MAXBITS + 1];   /* offsets in table for each length */
     static const unsigned short lbase[31] = { /* Length codes 257..285 base */
@@ -58,7 +62,7 @@ int ZLIB_INTERNAL inflate_table(codetype type, unsigned short FAR *lens,
     };
     static const unsigned short lext[31] = { /* Length codes 257..285 extra */
         16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18,
-        19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 72, 78
+        19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 77, 202
     };
     static const unsigned short dbase[32] = { /* Distance codes 0..29 base */
         1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
@@ -180,19 +184,17 @@ int ZLIB_INTERNAL inflate_table(codetype type, unsigned short FAR *lens,
     switch (type) {
         case CODES:
             base = extra = work;    /* dummy value--not used */
-            end = 19;
+            match = 20;
             break;
         case LENS:
             base = lbase;
-            base -= 257;
             extra = lext;
-            extra -= 257;
+            match = 257;
-            end = 256;
             break;
         default:    /* DISTS */
             base = dbase;
             extra = dext;
-            end = -1;
+            match = 0;
     }
 
     /* initialize state for loop */
@@ -215,12 +217,12 @@ int ZLIB_INTERNAL inflate_table(codetype type, unsigned short FAR *lens,
     for (;;) {
         /* create table entry */
         here.bits = (unsigned char)(len - drop);
-        if ((int)(work[sym]) < end) {
+        if (work[sym] + 1U < match) {
             here.op = (unsigned char)0;
             here.val = work[sym];
-        } else if ((int)(work[sym]) > end) {
+        } else if (work[sym] >= match) {
-            here.op = (unsigned char)(extra[work[sym]]);
+            here.op = (unsigned char)(extra[work[sym] - match]);
-            here.val = base[work[sym]];
+            here.val = base[work[sym] - match];
         } else {
             here.op = (unsigned char)(32 + 64);         /* end of block */
             here.val = 0;
@@ -300,3 +302,4 @@ int ZLIB_INTERNAL inflate_table(codetype type, unsigned short FAR *lens,
     *bits = root;
     return 0;
 }
+

common/zlib/inftrees.h

@@ -60,3 +60,4 @@ typedef enum {
 int ZLIB_INTERNAL inflate_table OF((codetype type, unsigned short FAR *lens,
                                     unsigned codes, code FAR *FAR *table,
                                     unsigned FAR *bits, unsigned short FAR *work));
+

common/zlib/trees.c

@@ -1,5 +1,5 @@
 /* trees.c -- output deflated data using Huffman coding
- * Copyright (C) 1995-2012 Jean-loup Gailly
+ * Copyright (C) 1995-2017 Jean-loup Gailly
  * detect_data_type() function provided freely by Cosmin Truta, 2006
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
@@ -32,19 +32,11 @@
 
 /* @(#) $Id$ */
 
-//-----------------------------------------------------------------------------
-// This version of zlib is modified for use within the Proxmark3 project.
-// Files from the original distribution which are not required for this
-// purpose are not included. All modifications can easily be found
-// by searching for #ifdef ZLIB_PM3_TUNED and #ifndef ZLIB_PM3_TUNED.
-//-----------------------------------------------------------------------------
-
 /* #define GEN_TREES_H */
 
-
 #include "deflate.h"
 
-#ifdef DEBUG
+#ifdef ZLIB_DEBUG
 #  include <ctype.h>
 #endif
 
@@ -130,13 +122,13 @@ struct static_tree_desc_s {
     int     max_length;          /* max bit length for the codes */
 };
 
-local static_tree_desc  static_l_desc =
+local const static_tree_desc  static_l_desc =
 {static_ltree, extra_lbits, LITERALS + 1, L_CODES, MAX_BITS};
 
-local static_tree_desc  static_d_desc =
+local const static_tree_desc  static_d_desc =
 {static_dtree, extra_dbits, 0,          D_CODES, MAX_BITS};
 
-local static_tree_desc  static_bl_desc =
+local const static_tree_desc  static_bl_desc =
 {(const ct_data *)0, extra_blbits, 0,   BL_CODES, MAX_BL_BITS};
 
 /* ===========================================================================
@@ -160,18 +152,16 @@ local int  detect_data_type OF((deflate_state *s));
 local unsigned bi_reverse OF((unsigned value, int length));
 local void bi_windup      OF((deflate_state *s));
 local void bi_flush       OF((deflate_state *s));
-local void copy_block     OF((deflate_state *s, charf *buf, unsigned len,
-                              int header));
 
 #ifdef GEN_TREES_H
 local void gen_trees_header OF((void));
 #endif
 
-#ifndef DEBUG
+#ifndef ZLIB_DEBUG
 #  define send_code(s, c, tree) send_bits(s, tree[c].Code, tree[c].Len)
 /* Send a code of the given tree. c and tree must not have side effects */
 
-#else /* DEBUG */
+#else /* !ZLIB_DEBUG */
 #  define send_code(s, c, tree) \
      { if (z_verbose>2) fprintf(stderr,"\ncd %3d ",(c)); \
        send_bits(s, tree[c].Code, tree[c].Len); }
@@ -184,13 +174,13 @@ local void gen_trees_header OF((void));
 #define put_short(s, w) { \
     put_byte(s, (uch)((w) & 0xff)); \
     put_byte(s, (uch)((ush)(w) >> 8)); \
-    }
+}
 
 /* ===========================================================================
  * Send a value on a given number of bits.
  * IN assertion: length <= 16 and value fits in length bits.
  */
-#ifdef DEBUG
+#ifdef ZLIB_DEBUG
 local void send_bits      OF((deflate_state *s, int value, int length));
 
 local void send_bits(s, value, length)
@@ -216,12 +206,12 @@ int length; /* number of bits */
         s->bi_valid += length;
     }
 }
-#else /* !DEBUG */
+#else /* !ZLIB_DEBUG */
 
 #define send_bits(s, value, length) \
-    { int len = length;\
+{ int len = length;\
   if (s->bi_valid > (int)Buf_size - len) {\
-            int val = value;\
+    int val = (int)value;\
     s->bi_buf |= (ush)val << s->bi_valid;\
     put_short(s, s->bi_buf);\
     s->bi_buf = (ush)val >> (Buf_size - s->bi_valid);\
@@ -230,8 +220,8 @@ int length; /* number of bits */
     s->bi_buf |= (ush)(value) << s->bi_valid;\
     s->bi_valid += len;\
   }\
-    }
+}
-#endif /* DEBUG */
+#endif /* ZLIB_DEBUG */
 
 
 /* the arguments must not have side effects */
@@ -324,7 +314,7 @@ local void tr_static_init() {
  * Genererate the file trees.h describing the static trees.
  */
 #ifdef GEN_TREES_H
-#  ifndef DEBUG
+#  ifndef ZLIB_DEBUG
 #    include <stdio.h>
 #  endif
 
@@ -400,7 +390,7 @@ deflate_state *s;
 
     s->bi_buf = 0;
     s->bi_valid = 0;
-#ifdef DEBUG
+#ifdef ZLIB_DEBUG
     s->compressed_len = 0L;
     s->bits_sent = 0L;
 #endif
@@ -436,11 +426,11 @@ deflate_state *s;
  * one less element. Updates heap and heap_len.
  */
 #define pqremove(s, tree, top) \
-    {\
+{\
     top = s->heap[SMALLEST]; \
     s->heap[SMALLEST] = s->heap[s->heap_len--]; \
     pqdownheap(s, tree, SMALLEST); \
-    }
+}
 
 /* ===========================================================================
  * Compares to subtrees, using the tree depth as tie breaker when
@@ -529,12 +519,12 @@ tree_desc *desc;    /* the tree descriptor */
         xbits = 0;
         if (n >= base) xbits = extra[n - base];
         f = tree[n].Freq;
-        s->opt_len += (ulg)f * (bits + xbits);
+        s->opt_len += (ulg)f * (unsigned)(bits + xbits);
-        if (stree) s->static_len += (ulg)f * (stree[n].Len + xbits);
+        if (stree) s->static_len += (ulg)f * (unsigned)(stree[n].Len + xbits);
     }
     if (overflow == 0) return;
 
-    Trace((stderr, "\nbit length overflow\n"));
+    Tracev((stderr, "\nbit length overflow\n"));
     /* This happens for example on obj2 and pic of the Calgary corpus */
 
     /* Find the first bit length which could increase: */
@@ -561,9 +551,8 @@ tree_desc *desc;    /* the tree descriptor */
             m = s->heap[--h];
             if (m > max_code) continue;
             if ((unsigned) tree[m].Len != (unsigned) bits) {
-                Trace((stderr, "code %d bits %d->%d\n", m, tree[m].Len, bits));
+                Tracev((stderr, "code %d bits %d->%d\n", m, tree[m].Len, bits));
-                s->opt_len += ((long)bits - (long)tree[m].Len)
+                s->opt_len += ((ulg)bits - tree[m].Len) * tree[m].Freq;
-                              * (long)tree[m].Freq;
                 tree[m].Len = (ush)bits;
             }
             n--;
@@ -585,7 +574,7 @@ int max_code;              /* largest code with non zero frequency */
 ushf *bl_count;            /* number of codes at each bit length */
 {
     ush next_code[MAX_BITS + 1]; /* next code value for each bit length */
-    ush code = 0;              /* running code value */
+    unsigned code = 0;         /* running code value */
     int bits;                  /* bit index */
     int n;                     /* code index */
 
@@ -593,7 +582,8 @@ ushf *bl_count;            /* number of codes at each bit length */
      * without bit reversal.
      */
     for (bits = 1; bits <= MAX_BITS; bits++) {
-        next_code[bits] = code = (code + bl_count[bits - 1]) << 1;
+        code = (code + bl_count[bits - 1]) << 1;
+        next_code[bits] = (ush)code;
     }
     /* Check that the bit counts in bl_count are consistent. The last code
      * must be all ones.
@@ -606,7 +596,7 @@ ushf *bl_count;            /* number of codes at each bit length */
         int len = tree[n].Len;
         if (len == 0) continue;
         /* Now reverse the bits */
-        tree[n].Code = bi_reverse(next_code[len]++, len);
+        tree[n].Code = (ush)bi_reverse(next_code[len]++, len);
 
         Tracecv(tree != static_ltree, (stderr, "\nn %3d %c l %2d c %4x (%x) ",
                                        n, (isgraph(n) ? n : ' '), len, tree[n].Code, next_code[len] - 1));
@@ -838,7 +828,7 @@ deflate_state *s;
         if (s->bl_tree[bl_order[max_blindex]].Len != 0) break;
     }
     /* Update opt_len to include the bit length tree and counts */
-    s->opt_len += 3 * (max_blindex + 1) + 5 + 5 + 4;
+    s->opt_len += 3 * ((ulg)max_blindex + 1) + 5 + 5 + 4;
     Tracev((stderr, "\ndyn trees: dyn %ld, stat %ld",
             s->opt_len, s->static_len));
 
@@ -886,11 +876,17 @@ ulg stored_len;   /* length of input block */
 int last;         /* one if this is the last block for a file */
 {
     send_bits(s, (STORED_BLOCK << 1) + last, 3); /* send block type */
-#ifdef DEBUG
+    bi_windup(s);        /* align on byte boundary */
+    put_short(s, (ush)stored_len);
+    put_short(s, (ush)~stored_len);
+    zmemcpy(s->pending_buf + s->pending, (Bytef *)buf, stored_len);
+    s->pending += stored_len;
+#ifdef ZLIB_DEBUG
     s->compressed_len = (s->compressed_len + 3 + 7) & (ulg)~7L;
     s->compressed_len += (stored_len + 4) << 3;
+    s->bits_sent += 2 * 16;
+    s->bits_sent += stored_len << 3;
 #endif
-    copy_block(s, buf, (unsigned)stored_len, 1); /* with header */
 }
 
 /* ===========================================================================
@@ -911,7 +907,7 @@ deflate_state *s;
 {
     send_bits(s, STATIC_TREES << 1, 3);
     send_code(s, END_BLOCK, static_ltree);
-#ifdef DEBUG
+#ifdef ZLIB_DEBUG
     s->compressed_len += 10L; /* 3 for block type, 7 for EOB */
 #endif
     bi_flush(s);
@@ -919,7 +915,7 @@ deflate_state *s;
 
 /* ===========================================================================
  * Determine the best encoding for the current block: dynamic trees, static
- * trees or store, and output the encoded block to the zip file.
+ * trees or store, and write out the encoded block.
  */
 void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last)
 deflate_state *s;
@@ -993,7 +989,7 @@ int last;         /* one if this is the last block for a file */
         send_bits(s, (STATIC_TREES << 1) + last, 3);
         compress_block(s, (const ct_data *)static_ltree,
                        (const ct_data *)static_dtree);
-#ifdef DEBUG
+#ifdef ZLIB_DEBUG
         s->compressed_len += 3 + s->static_len;
 #endif
     } else {
@@ -1003,7 +999,7 @@ int last;         /* one if this is the last block for a file */
                        max_blindex + 1);
         compress_block(s, (const ct_data *)s->dyn_ltree,
                        (const ct_data *)s->dyn_dtree);
-#ifdef DEBUG
+#ifdef ZLIB_DEBUG
         s->compressed_len += 3 + s->opt_len;
 #endif
 #ifndef ZLIB_PM3_TUNED
@@ -1017,11 +1013,12 @@ int last;         /* one if this is the last block for a file */
 
     if (last) {
         bi_windup(s);
-#ifdef DEBUG
+#ifdef ZLIB_DEBUG
         s->compressed_len += 7;  /* align on byte boundary */
 #endif
     }
-    Tracev((stderr, "\ncomprlen %lu(%lu) ", s->compressed_len >> 3, s->compressed_len - 7 * last));
+    Tracev((stderr, "\ncomprlen %lu(%lu) ", s->compressed_len >> 3,
+            s->compressed_len - 7 * last));
 }
 
 /* ===========================================================================
@@ -1111,7 +1108,7 @@ const ct_data *dtree; /* distance tree */
                 send_code(s, code, dtree);       /* send the distance code */
                 extra = extra_dbits[code];
                 if (extra != 0) {
-                    dist -= base_dist[code];
+                    dist -= (unsigned)base_dist[code];
                     send_bits(s, dist, extra);   /* send the extra distance bits */
                 }
             } /* literal or match pair ? */
@@ -1214,34 +1211,8 @@ deflate_state *s;
     }
     s->bi_buf = 0;
     s->bi_valid = 0;
-#ifdef DEBUG
+#ifdef ZLIB_DEBUG
     s->bits_sent = (s->bits_sent + 7) & ~7;
 #endif
 }
 
-/* ===========================================================================
- * Copy a stored block, storing first the length and its
- * one's complement if requested.
- */
-local void copy_block(s, buf, len, header)
-deflate_state *s;
-charf    *buf;    /* the input data */
-unsigned len;     /* its length */
-int      header;  /* true if block header must be written */
-{
-    bi_windup(s);        /* align on byte boundary */
-
-    if (header) {
-        put_short(s, (ush)len);
-        put_short(s, (ush)~len);
-#ifdef DEBUG
-        s->bits_sent += 2 * 16;
-#endif
-    }
-#ifdef DEBUG
-    s->bits_sent += (ulg)len << 3;
-#endif
-    while (len--) {
-        put_byte(s, *buf++);
-    }
-}

common/zlib/trees.h

@@ -126,3 +126,4 @@ local const int base_dist[D_CODES] = {
     1024,  1536,  2048,  3072,  4096,  6144,  8192, 12288, 16384, 24576
 };
 
+

common/zlib/zconf.h

@@ -1,5 +1,5 @@
 /* zconf.h -- configuration of the zlib compression library
- * Copyright (C) 1995-2013 Jean-loup Gailly.
+ * Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -17,7 +17,7 @@
 #ifdef Z_PREFIX     /* may be set to #if 1 by ./configure */
 #  define Z_PREFIX_SET
 
-/* all linked symbols */
+/* all linked symbols and init macros */
 #  define _dist_code            z__dist_code
 #  define _length_code          z__length_code
 #  define _tr_align             z__tr_align
@@ -29,6 +29,7 @@
 #  define adler32               z_adler32
 #  define adler32_combine       z_adler32_combine
 #  define adler32_combine64     z_adler32_combine64
+#  define adler32_z             z_adler32_z
 #  ifndef Z_SOLO
 #    define compress              z_compress
 #    define compress2             z_compress2
@@ -37,10 +38,14 @@
 #  define crc32                 z_crc32
 #  define crc32_combine         z_crc32_combine
 #  define crc32_combine64       z_crc32_combine64
+#  define crc32_z               z_crc32_z
 #  define deflate               z_deflate
 #  define deflateBound          z_deflateBound
 #  define deflateCopy           z_deflateCopy
 #  define deflateEnd            z_deflateEnd
+#  define deflateGetDictionary  z_deflateGetDictionary
+#  define deflateInit           z_deflateInit
+#  define deflateInit2          z_deflateInit2
 #  define deflateInit2_         z_deflateInit2_
 #  define deflateInit_          z_deflateInit_
 #  define deflateParams         z_deflateParams
@@ -67,6 +72,8 @@
 #    define gzeof                 z_gzeof
 #    define gzerror               z_gzerror
 #    define gzflush               z_gzflush
+#    define gzfread               z_gzfread
+#    define gzfwrite              z_gzfwrite
 #    define gzgetc                z_gzgetc
 #    define gzgetc_               z_gzgetc_
 #    define gzgets                z_gzgets
@@ -78,7 +85,6 @@
 #      define gzopen_w              z_gzopen_w
 #    endif
 #    define gzprintf              z_gzprintf
-#    define gzvprintf             z_gzvprintf
 #    define gzputc                z_gzputc
 #    define gzputs                z_gzputs
 #    define gzread                z_gzread
@@ -89,32 +95,39 @@
 #    define gztell                z_gztell
 #    define gztell64              z_gztell64
 #    define gzungetc              z_gzungetc
+#    define gzvprintf             z_gzvprintf
 #    define gzwrite               z_gzwrite
 #  endif
 #  define inflate               z_inflate
 #  define inflateBack           z_inflateBack
 #  define inflateBackEnd        z_inflateBackEnd
+#  define inflateBackInit       z_inflateBackInit
 #  define inflateBackInit_      z_inflateBackInit_
+#  define inflateCodesUsed      z_inflateCodesUsed
 #  define inflateCopy           z_inflateCopy
 #  define inflateEnd            z_inflateEnd
+#  define inflateGetDictionary  z_inflateGetDictionary
 #  define inflateGetHeader      z_inflateGetHeader
+#  define inflateInit           z_inflateInit
+#  define inflateInit2          z_inflateInit2
 #  define inflateInit2_         z_inflateInit2_
 #  define inflateInit_          z_inflateInit_
 #  define inflateMark           z_inflateMark
 #  define inflatePrime          z_inflatePrime
 #  define inflateReset          z_inflateReset
 #  define inflateReset2         z_inflateReset2
+#  define inflateResetKeep      z_inflateResetKeep
 #  define inflateSetDictionary  z_inflateSetDictionary
-#  define inflateGetDictionary  z_inflateGetDictionary
 #  define inflateSync           z_inflateSync
 #  define inflateSyncPoint      z_inflateSyncPoint
 #  define inflateUndermine      z_inflateUndermine
-#  define inflateResetKeep      z_inflateResetKeep
+#  define inflateValidate       z_inflateValidate
 #  define inflate_copyright     z_inflate_copyright
 #  define inflate_fast          z_inflate_fast
 #  define inflate_table         z_inflate_table
 #  ifndef Z_SOLO
 #    define uncompress            z_uncompress
+#    define uncompress2           z_uncompress2
 #  endif
 #  define zError                z_zError
 #  ifndef Z_SOLO
@@ -224,9 +237,19 @@
 #  define z_const
 #endif
 
-/* Some Mac compilers merge all .h files incorrectly: */
+#ifdef Z_SOLO
-#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)
+typedef unsigned long z_size_t;
-#  define NO_DUMMY_DECL
+#else
+#  define z_longlong long long
+#  if defined(NO_SIZE_T)
+typedef unsigned NO_SIZE_T z_size_t;
+#  elif defined(STDC)
+#    include <stddef.h>
+typedef size_t z_size_t;
+#  else
+typedef unsigned long z_size_t;
+#  endif
+#  undef z_longlong
 #endif
 
 /* Maximum value for memLevel in deflateInit2 */
@@ -256,7 +279,7 @@
  Of course this will generally degrade compression (there's no free lunch).
 
    The memory requirements for inflate are (in bytes) 1 << windowBits
- that is, 32K for windowBits=15 (default value) plus a few kilobytes
+ that is, 32K for windowBits=15 (default value) plus about 7 kilobytes
  for small objects.
 */
 
@@ -509,3 +532,4 @@ typedef unsigned long z_crc_t;
 #endif
 
 #endif /* ZCONF_H */
+

common/zlib/zlib.h

@@ -1,7 +1,7 @@
 /* zlib.h -- interface of the 'zlib' general purpose compression library
-  version 1.2.8, April 28th, 2013
+  version 1.2.11, January 15th, 2017
 
-  Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
+  Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages
@@ -28,13 +28,6 @@
   (zlib format), rfc1951 (deflate format) and rfc1952 (gzip format).
 */
 
-//-----------------------------------------------------------------------------
-// This version of zlib is modified for use within the Proxmark3 project.
-// Files from the original distribution which are not required for this
-// purpose are not included. All modifications can easily be found
-// by searching for #ifdef ZLIB_PM3_TUNED and #ifndef ZLIB_PM3_TUNED.
-//-----------------------------------------------------------------------------
-
 #ifndef ZLIB_H
 #define ZLIB_H
 
@@ -45,18 +38,18 @@ extern "C" {
 #endif
 
 #ifndef ZLIB_PM3_TUNED
-#define ZLIB_VERSION "1.2.8"
+#define ZLIB_VERSION "1.2.11"
-#define ZLIB_VERNUM 0x1280
+#define ZLIB_VERNUM 0x12b0
 #define ZLIB_VER_MAJOR 1
 #define ZLIB_VER_MINOR 2
-#define ZLIB_VER_REVISION 8
+#define ZLIB_VER_REVISION 11
 #define ZLIB_VER_SUBREVISION 0
 #else
-#define ZLIB_VERSION "1.2.8.f-Proxmark3"
+#define ZLIB_VERSION "1.2.11.f-Proxmark3"
-#define ZLIB_VERNUM 0x128f
+#define ZLIB_VERNUM 0x12bf
 #define ZLIB_VER_MAJOR 1
 #define ZLIB_VER_MINOR 2
-#define ZLIB_VER_REVISION 8
+#define ZLIB_VER_REVISION 11
 #define ZLIB_VER_SUBREVISION f
 #endif
 
@@ -83,7 +76,8 @@ extern "C" {
   with "gz".  The gzip format is different from the zlib format.  gzip is a
   gzip wrapper, documented in RFC 1952, wrapped around a deflate stream.
 
-    This library can optionally read and write gzip streams in memory as well.
+    This library can optionally read and write gzip and raw deflate streams in
+  memory as well.
 
     The zlib format was designed to be compact and fast for use in memory
   and on communications channels.  The gzip format was designed for single-
@@ -92,7 +86,7 @@ extern "C" {
 
     The library does not install any signal handler.  The decoder checks
   the consistency of the compressed data, so the library should never crash
-  even in case of corrupted input.
+  even in the case of corrupted input.
 */
 
 typedef voidpf(*alloc_func) OF((voidpf opaque, uInt items, uInt size));
@@ -105,7 +99,7 @@ typedef struct z_stream_s {
     uInt     avail_in;  /* number of bytes available at next_in */
     uLong    total_in;  /* total number of input bytes read so far */
 
-    Bytef    *next_out; /* next output byte should be put there */
+    Bytef    *next_out; /* next output byte will go here */
     uInt     avail_out; /* remaining free space at next_out */
     uLong    total_out; /* total number of bytes output so far */
 
@@ -116,8 +110,9 @@ typedef struct z_stream_s {
     free_func  zfree;   /* used to free the internal state */
     voidpf     opaque;  /* private data object passed to zalloc and zfree */
 
-    int     data_type;  /* best guess about the data type: binary or text */
+    int     data_type;  /* best guess about the data type: binary or text
-    uLong   adler;      /* adler32 value of the uncompressed data */
+                           for deflate, or the decoding state for inflate */
+    uLong   adler;      /* Adler-32 or CRC-32 value of the uncompressed data */
     uLong   reserved;   /* reserved for future use */
 } z_stream;
 
@@ -160,7 +155,9 @@ typedef gz_header FAR *gz_headerp;
 
      zalloc must return Z_NULL if there is not enough memory for the object.
    If zlib is used in a multi-threaded application, zalloc and zfree must be
-   thread safe.
+   thread safe.  In that case, zlib is thread-safe.  When zalloc and zfree are
+   Z_NULL on entry to the initialization function, they are set to internal
+   routines that use the standard library functions malloc() and free().
 
      On 16-bit systems, the functions zalloc and zfree must be able to allocate
    exactly 65536 bytes, but will not be required to allocate more than this if
@@ -173,7 +170,7 @@ typedef gz_header FAR *gz_headerp;
 
      The fields total_in and total_out can be used for statistics or progress
    reports.  After compression, total_in holds the total size of the
-   uncompressed data and may be saved for use in the decompressor (particularly
+   uncompressed data and may be saved for use by the decompressor (particularly
    if the decompressor wants to decompress everything in a single step).
 */
 
@@ -218,7 +215,7 @@ typedef gz_header FAR *gz_headerp;
 #define Z_TEXT     1
 #define Z_ASCII    Z_TEXT   /* for compatibility with 1.2.2 and earlier */
 #define Z_UNKNOWN  2
-/* Possible values of the data_type field (though see inflate()) */
+/* Possible values of the data_type field for deflate() */
 
 #define Z_DEFLATED   8
 /* The deflate compression method (the only one supported in this version) */
@@ -276,11 +273,11 @@ ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
     enough room in the output buffer), next_in and avail_in are updated and
     processing will resume at this point for the next call of deflate().
 
-  - Provide more output starting at next_out and update next_out and avail_out
+  - Generate more output starting at next_out and update next_out and avail_out
     accordingly.  This action is forced if the parameter flush is non zero.
     Forcing flush frequently degrades the compression ratio, so this parameter
-    should be set only when necessary (in interactive applications).  Some
+    should be set only when necessary.  Some output may be provided even if
-    output may be provided even if flush is not set.
+    flush is zero.
 
     Before the call of deflate(), the application should ensure that at least
   one of the actions is possible, by providing more input and/or consuming more
@@ -289,7 +286,9 @@ ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
   output when it wants, for example when the output buffer is full (avail_out
   == 0), or after each call of deflate().  If deflate returns Z_OK and with
   zero avail_out, it must be called again after making room in the output
-  buffer because there might be more output pending.
+  buffer because there might be more output pending. See deflatePending(),
+  which can be used if desired to determine whether or not there is more ouput
+  in that case.
 
     Normally the parameter flush is set to Z_NO_FLUSH, which allows deflate to
   decide how much data to accumulate before producing output, in order to
@@ -310,8 +309,8 @@ ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
   input data so far will be available to the decompressor, as for Z_SYNC_FLUSH.
   This completes the current deflate block and follows it with an empty fixed
   codes block that is 10 bits long.  This assures that enough bytes are output
-  in order for the decompressor to finish the block before the empty fixed code
+  in order for the decompressor to finish the block before the empty fixed
-  block.
+  codes block.
 
     If flush is set to Z_BLOCK, a deflate block is completed and emitted, as
   for Z_SYNC_FLUSH, but the output is not aligned on a byte boundary, and up to
@@ -337,34 +336,38 @@ ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
 
     If the parameter flush is set to Z_FINISH, pending input is processed,
   pending output is flushed and deflate returns with Z_STREAM_END if there was
-  enough output space; if deflate returns with Z_OK, this function must be
+  enough output space.  If deflate returns with Z_OK or Z_BUF_ERROR, this
-  called again with Z_FINISH and more output space (updated avail_out) but no
+  function must be called again with Z_FINISH and more output space (updated
-  more input data, until it returns with Z_STREAM_END or an error.  After
+  avail_out) but no more input data, until it returns with Z_STREAM_END or an
-  deflate has returned Z_STREAM_END, the only possible operations on the stream
+  error.  After deflate has returned Z_STREAM_END, the only possible operations
-  are deflateReset or deflateEnd.
+  on the stream are deflateReset or deflateEnd.
 
-    Z_FINISH can be used immediately after deflateInit if all the compression
+    Z_FINISH can be used in the first deflate call after deflateInit if all the
-  is to be done in a single step.  In this case, avail_out must be at least the
+  compression is to be done in a single step.  In order to complete in one
-  value returned by deflateBound (see below).  Then deflate is guaranteed to
+  call, avail_out must be at least the value returned by deflateBound (see
-  return Z_STREAM_END.  If not enough output space is provided, deflate will
+  below).  Then deflate is guaranteed to return Z_STREAM_END.  If not enough
-  not return Z_STREAM_END, and it must be called again as described above.
+  output space is provided, deflate will not return Z_STREAM_END, and it must
+  be called again as described above.
 
-    deflate() sets strm->adler to the adler32 checksum of all input read
+    deflate() sets strm->adler to the Adler-32 checksum of all input read
-  so far (that is, total_in bytes).
+  so far (that is, total_in bytes).  If a gzip stream is being generated, then
+  strm->adler will be the CRC-32 checksum of the input read so far.  (See
+  deflateInit2 below.)
 
     deflate() may update strm->data_type if it can make a good guess about
-  the input data type (Z_BINARY or Z_TEXT).  In doubt, the data is considered
+  the input data type (Z_BINARY or Z_TEXT).  If in doubt, the data is
-  binary.  This field is only for information purposes and does not affect the
+  considered binary.  This field is only for information purposes and does not
-  compression algorithm in any manner.
+  affect the compression algorithm in any manner.
 
     deflate() returns Z_OK if some progress has been made (more input
   processed or more output produced), Z_STREAM_END if all input has been
   consumed and all output has been produced (only when flush is set to
   Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example
-  if next_in or next_out was Z_NULL), Z_BUF_ERROR if no progress is possible
+  if next_in or next_out was Z_NULL or the state was inadvertently written over
-  (for example avail_in or avail_out was zero).  Note that Z_BUF_ERROR is not
+  by the application), or Z_BUF_ERROR if no progress is possible (for example
-  fatal, and deflate() can be called again with more input and more output
+  avail_in or avail_out was zero).  Note that Z_BUF_ERROR is not fatal, and
-  space to continue compressing.
+  deflate() can be called again with more input and more output space to
+  continue compressing.
 */
 
 
@@ -387,23 +390,21 @@ ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm));
 
      Initializes the internal stream state for decompression.  The fields
    next_in, avail_in, zalloc, zfree and opaque must be initialized before by
-   the caller.  If next_in is not Z_NULL and avail_in is large enough (the
+   the caller.  In the current version of inflate, the provided input is not
-   exact value depends on the compression method), inflateInit determines the
+   read or consumed.  The allocation of a sliding window will be deferred to
-   compression method from the zlib header and allocates all data structures
+   the first call of inflate (if the decompression does not complete on the
-   accordingly; otherwise the allocation will be deferred to the first call of
+   first call).  If zalloc and zfree are set to Z_NULL, inflateInit updates
-   inflate.  If zalloc and zfree are set to Z_NULL, inflateInit updates them to
+   them to use default allocation functions.
-   use default allocation functions.
 
      inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
    memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
    version assumed by the caller, or Z_STREAM_ERROR if the parameters are
    invalid, such as a null pointer to the structure.  msg is set to null if
-   there is no error message.  inflateInit does not perform any decompression
+   there is no error message.  inflateInit does not perform any decompression.
-   apart from possibly reading the zlib header if present: actual decompression
+   Actual decompression will be done by inflate().  So next_in, and avail_in,
-   will be done by inflate().  (So next_in and avail_in may be modified, but
+   next_out, and avail_out are unused and unchanged.  The current
-   next_out and avail_out are unused and unchanged.) The current implementation
+   implementation of inflateInit() does not process any header information --
-   of inflateInit() does not process any header information -- that is deferred
+   that is deferred until inflate() is called.
-   until inflate() is called.
 */
 
 
@@ -419,17 +420,20 @@ ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
 
   - Decompress more input starting at next_in and update next_in and avail_in
     accordingly.  If not all input can be processed (because there is not
-    enough room in the output buffer), next_in is updated and processing will
+    enough room in the output buffer), then next_in and avail_in are updated
-    resume at this point for the next call of inflate().
+    accordingly, and processing will resume at this point for the next call of
+    inflate().
 
-  - Provide more output starting at next_out and update next_out and avail_out
+  - Generate more output starting at next_out and update next_out and avail_out
     accordingly.  inflate() provides as much output as possible, until there is
     no more input data or no more space in the output buffer (see below about
     the flush parameter).
 
     Before the call of inflate(), the application should ensure that at least
   one of the actions is possible, by providing more input and/or consuming more
-  output, and updating the next_* and avail_* values accordingly.  The
+  output, and updating the next_* and avail_* values accordingly.  If the
+  caller of inflate() does not provide both available input and available
+  output space, it is possible that there will be no progress made.  The
   application can consume the uncompressed output when it wants, for example
   when the output buffer is full (avail_out == 0), or after each call of
   inflate().  If inflate returns Z_OK and with zero avail_out, it must be
@@ -446,7 +450,7 @@ ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
   gets to the end of that block, or when it runs out of data.
 
     The Z_BLOCK option assists in appending to or combining deflate streams.
-  Also to assist in this, on return inflate() will set strm->data_type to the
+  To assist in this, on return inflate() always sets strm->data_type to the
   number of unused bits in the last byte taken from strm->next_in, plus 64 if
   inflate() is currently decoding the last block in the deflate stream, plus
   128 if inflate() returned immediately after decoding an end-of-block code or
@@ -494,32 +498,33 @@ ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
   chosen by the compressor and returns Z_NEED_DICT; otherwise it sets
   strm->adler to the Adler-32 checksum of all output produced so far (that is,
   total_out bytes) and returns Z_OK, Z_STREAM_END or an error code as described
-  below.  At the end of the stream, inflate() checks that its computed adler32
+  below.  At the end of the stream, inflate() checks that its computed Adler-32
   checksum is equal to that saved by the compressor and returns Z_STREAM_END
   only if the checksum is correct.
 
     inflate() can decompress and check either zlib-wrapped or gzip-wrapped
   deflate data.  The header type is detected automatically, if requested when
   initializing with inflateInit2().  Any information contained in the gzip
-  header is not retained, so applications that need that information should
+  header is not retained unless inflateGetHeader() is used.  When processing
-  instead use raw inflate, see inflateInit2() below, or inflateBack() and
-  perform their own processing of the gzip header and trailer.  When processing
   gzip-wrapped deflate data, strm->adler32 is set to the CRC-32 of the output
-  producted so far.  The CRC-32 is checked against the gzip trailer.
+  produced so far.  The CRC-32 is checked against the gzip trailer, as is the
+  uncompressed length, modulo 2^32.
 
     inflate() returns Z_OK if some progress has been made (more input processed
   or more output produced), Z_STREAM_END if the end of the compressed data has
   been reached and all uncompressed output has been produced, Z_NEED_DICT if a
   preset dictionary is needed at this point, Z_DATA_ERROR if the input data was
   corrupted (input stream not conforming to the zlib format or incorrect check
-  value), Z_STREAM_ERROR if the stream structure was inconsistent (for example
+  value, in which case strm->msg points to a string with a more specific
-  next_in or next_out was Z_NULL), Z_MEM_ERROR if there was not enough memory,
+  error), Z_STREAM_ERROR if the stream structure was inconsistent (for example
-  Z_BUF_ERROR if no progress is possible or if there was not enough room in the
+  next_in or next_out was Z_NULL, or the state was inadvertently written over
-  output buffer when Z_FINISH is used.  Note that Z_BUF_ERROR is not fatal, and
+  by the application), Z_MEM_ERROR if there was not enough memory, Z_BUF_ERROR
+  if no progress was possible or if there was not enough room in the output
+  buffer when Z_FINISH is used.  Note that Z_BUF_ERROR is not fatal, and
   inflate() can be called again with more input and more output space to
   continue decompressing.  If Z_DATA_ERROR is returned, the application may
   then call inflateSync() to look for a good compression block if a partial
-  recovery of the data is desired.
+  recovery of the data is to be attempted.
 */
 
 
@@ -529,9 +534,8 @@ ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm));
    This function discards any unprocessed input and does not flush any pending
    output.
 
-     inflateEnd returns Z_OK if success, Z_STREAM_ERROR if the stream state
+     inflateEnd returns Z_OK if success, or Z_STREAM_ERROR if the stream state
-   was inconsistent.  In the error case, msg may be set but then points to a
+   was inconsistent.
-   static string (which must not be deallocated).
 */
 
 
@@ -562,16 +566,29 @@ ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm,
    compression at the expense of memory usage.  The default value is 15 if
    deflateInit is used instead.
 
+     For the current implementation of deflate(), a windowBits value of 8 (a
+   window size of 256 bytes) is not supported.  As a result, a request for 8
+   will result in 9 (a 512-byte window).  In that case, providing 8 to
+   inflateInit2() will result in an error when the zlib header with 9 is
+   checked against the initialization of inflate().  The remedy is to not use 8
+   with deflateInit2() with this initialization, or at least in that case use 9
+   with inflateInit2().
+
      windowBits can also be -8..-15 for raw deflate.  In this case, -windowBits
    determines the window size.  deflate() will then generate raw deflate data
-   with no zlib header or trailer, and will not compute an adler32 check value.
+   with no zlib header or trailer, and will not compute a check value.
 
      windowBits can also be greater than 15 for optional gzip encoding.  Add
    16 to windowBits to write a simple gzip header and trailer around the
    compressed data instead of a zlib wrapper.  The gzip header will have no
    file name, no extra data, no comment, no modification time (set to zero), no
-   header crc, and the operating system will be set to 255 (unknown).  If a
+   header crc, and the operating system will be set to the appropriate value,
-   gzip stream is being written, strm->adler is a crc32 instead of an adler32.
+   if the operating system was determined at compile time.  If a gzip stream is
+   being written, strm->adler is a CRC-32 instead of an Adler-32.
+
+     For raw deflate or gzip encoding, a request for a 256-byte window is
+   rejected as invalid, since only the zlib header provides a means of
+   transmitting the window size to the decompressor.
 
      The memLevel parameter specifies how much memory should be allocated
    for the internal compression state.  memLevel=1 uses minimum memory but is
@@ -632,12 +649,12 @@ ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm,
    addition, the current implementation of deflate will use at most the window
    size minus 262 bytes of the provided dictionary.
 
-     Upon return of this function, strm->adler is set to the adler32 value
+     Upon return of this function, strm->adler is set to the Adler-32 value
    of the dictionary; the decompressor may later use this value to determine
-   which dictionary has been used by the compressor.  (The adler32 value
+   which dictionary has been used by the compressor.  (The Adler-32 value
    applies to the whole dictionary even if only a subset of the dictionary is
    actually used by the compressor.) If a raw deflate was requested, then the
-   adler32 value is not computed and strm->adler is not set.
+   Adler-32 value is not computed and strm->adler is not set.
 
      deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a
    parameter is invalid (e.g.  dictionary being Z_NULL) or the stream state is
@@ -646,6 +663,28 @@ ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm,
    not perform any compression: this will be done by deflate().
 */
 
+ZEXTERN int ZEXPORT deflateGetDictionary OF((z_streamp strm,
+                                             Bytef *dictionary,
+                                             uInt  *dictLength));
+/*
+     Returns the sliding dictionary being maintained by deflate.  dictLength is
+   set to the number of bytes in the dictionary, and that many bytes are copied
+   to dictionary.  dictionary must have enough space, where 32768 bytes is
+   always enough.  If deflateGetDictionary() is called with dictionary equal to
+   Z_NULL, then only the dictionary length is returned, and nothing is copied.
+   Similary, if dictLength is Z_NULL, then it is not set.
+
+     deflateGetDictionary() may return a length less than the window size, even
+   when more than the window size in input has been provided. It may return up
+   to 258 bytes less in that case, due to how zlib's implementation of deflate
+   manages the sliding window and lookahead for matches, where matches can be
+   up to 258 bytes long. If the application needs the last window-size bytes of
+   input, then that would need to be saved by the application outside of zlib.
+
+     deflateGetDictionary returns Z_OK on success, or Z_STREAM_ERROR if the
+   stream state is inconsistent.
+*/
+
 ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest,
                                     z_streamp source));
 /*
@@ -666,10 +705,10 @@ ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest,
 
 ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm));
 /*
-     This function is equivalent to deflateEnd followed by deflateInit,
+     This function is equivalent to deflateEnd followed by deflateInit, but
-   but does not free and reallocate all the internal compression state.  The
+   does not free and reallocate the internal compression state.  The stream
-   stream will keep the same compression level and any other attributes that
+   will leave the compression level and any other attributes that may have been
-   may have been set by deflateInit2.
+   set unchanged.
 
      deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
    stream state was inconsistent (such as zalloc or state being Z_NULL).
@@ -680,20 +719,36 @@ ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm,
                                       int strategy));
 /*
      Dynamically update the compression level and compression strategy.  The
-   interpretation of level and strategy is as in deflateInit2.  This can be
+   interpretation of level and strategy is as in deflateInit2().  This can be
    used to switch between compression and straight copy of the input data, or
    to switch to a different kind of input data requiring a different strategy.
-   If the compression level is changed, the input available so far is
+   If the compression approach (which is a function of the level) or the
-   compressed with the old level (and may be flushed); the new level will take
+   strategy is changed, and if any input has been consumed in a previous
-   effect only at the next call of deflate().
+   deflate() call, then the input available so far is compressed with the old
+   level and strategy using deflate(strm, Z_BLOCK).  There are three approaches
+   for the compression levels 0, 1..3, and 4..9 respectively.  The new level
+   and strategy will take effect at the next call of deflate().
 
-     Before the call of deflateParams, the stream state must be set as for
+     If a deflate(strm, Z_BLOCK) is performed by deflateParams(), and it does
-   a call of deflate(), since the currently available input may have to be
+   not have enough output space to complete, then the parameter change will not
-   compressed and flushed.  In particular, strm->avail_out must be non-zero.
+   take effect.  In this case, deflateParams() can be called again with the
+   same parameters and more output space to try again.
 
-     deflateParams returns Z_OK if success, Z_STREAM_ERROR if the source
+     In order to assure a change in the parameters on the first try, the
-   stream state was inconsistent or if a parameter was invalid, Z_BUF_ERROR if
+   deflate stream should be flushed using deflate() with Z_BLOCK or other flush
-   strm->avail_out was zero.
+   request until strm.avail_out is not zero, before calling deflateParams().
+   Then no more input data should be provided before the deflateParams() call.
+   If this is done, the old level and strategy will be applied to the data
+   compressed before deflateParams(), and the new level and strategy will be
+   applied to the the data compressed after deflateParams().
+
+     deflateParams returns Z_OK on success, Z_STREAM_ERROR if the source stream
+   state was inconsistent or if a parameter was invalid, or Z_BUF_ERROR if
+   there was not enough output space to complete the compression of the
+   available input data before a change in the strategy or approach.  Note that
+   in the case of a Z_BUF_ERROR, the parameters are not changed.  A return
+   value of Z_BUF_ERROR is not fatal, in which case deflateParams() can be
+   retried with more output space.
 */
 
 ZEXTERN int ZEXPORT deflateTune OF((z_streamp strm,
@@ -811,7 +866,7 @@ ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm,
    is for use with other formats that use the deflate compressed data format
    such as zip.  Those formats provide their own check values.  If a custom
    format is developed using the raw deflate format for compressed data, it is
-   recommended that a check value such as an adler32 or a crc32 be applied to
+   recommended that a check value such as an Adler-32 or a CRC-32 be applied to
    the uncompressed data as is done in the zlib, gzip, and zip formats.  For
    most applications, the zlib format should be used as is.  Note that comments
    above on the use in deflateInit2() applies to the magnitude of windowBits.
@@ -820,7 +875,10 @@ ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm,
    32 to windowBits to enable zlib and gzip decoding with automatic header
    detection, or add 16 to decode only the gzip format (the zlib format will
    return a Z_DATA_ERROR).  If a gzip stream is being decoded, strm->adler is a
-   crc32 instead of an adler32.
+   CRC-32 instead of an Adler-32.  Unlike the gunzip utility and gzread() (see
+   below), inflate() will not automatically decode concatenated gzip streams.
+   inflate() will return Z_STREAM_END at the end of the gzip stream.  The state
+   would need to be reset to continue decoding a subsequent gzip stream.
 
      inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
    memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
@@ -841,7 +899,7 @@ ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,
      Initializes the decompression dictionary from the given uncompressed byte
    sequence.  This function must be called immediately after a call of inflate,
    if that call returned Z_NEED_DICT.  The dictionary chosen by the compressor
-   can be determined from the adler32 value returned by that call of inflate.
+   can be determined from the Adler-32 value returned by that call of inflate.
    The compressor and decompressor must use exactly the same dictionary (see
    deflateSetDictionary).  For raw inflate, this function can be called at any
    time to set the dictionary.  If the provided dictionary is smaller than the
@@ -852,7 +910,7 @@ ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,
      inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a
    parameter is invalid (e.g.  dictionary being Z_NULL) or the stream state is
    inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the
-   expected one (incorrect adler32 value).  inflateSetDictionary does not
+   expected one (incorrect Adler-32 value).  inflateSetDictionary does not
    perform any decompression: this will be done by subsequent calls of
    inflate().
 */
@@ -910,7 +968,7 @@ ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest,
 ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm));
 /*
      This function is equivalent to inflateEnd followed by inflateInit,
-   but does not free and reallocate all the internal decompression state.  The
+   but does not free and reallocate the internal decompression state.  The
    stream will keep attributes that may have been set by inflateInit2.
 
      inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
@@ -922,7 +980,9 @@ ZEXTERN int ZEXPORT inflateReset2 OF((z_streamp strm,
 /*
      This function is the same as inflateReset, but it also permits changing
    the wrap and window size requests.  The windowBits parameter is interpreted
-   the same as it is for inflateInit2.
+   the same as it is for inflateInit2.  If the window size is changed, then the
+   memory allocated for the window is freed, and the window will be reallocated
+   by inflate() if needed.
 
      inflateReset2 returns Z_OK if success, or Z_STREAM_ERROR if the source
    stream state was inconsistent (such as zalloc or state being Z_NULL), or if
@@ -974,7 +1034,7 @@ ZEXTERN long ZEXPORT inflateMark OF((z_streamp strm));
    location in the input stream can be determined from avail_in and data_type
    as noted in the description for the Z_BLOCK flush parameter for inflate.
 
-     inflateMark returns the value noted above or -1 << 16 if the provided
+     inflateMark returns the value noted above, or -65536 if the provided
    source stream state was inconsistent.
 */
 
@@ -1066,9 +1126,9 @@ ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm,
    This routine would normally be used in a utility that reads zip or gzip
    files and writes out uncompressed files.  The utility would decode the
    header and process the trailer on its own, hence this routine expects only
-   the raw deflate stream to decompress.  This is different from the normal
+   the raw deflate stream to decompress.  This is different from the default
-   behavior of inflate(), which expects either a zlib or gzip header and
+   behavior of inflate(), which expects a zlib header and trailer around the
-   trailer around the deflate stream.
+   deflate stream.
 
      inflateBack() uses two subroutines supplied by the caller that are then
    called by inflateBack() for input and output.  inflateBack() calls those
@@ -1077,12 +1137,12 @@ ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm,
    parameters and return types are defined above in the in_func and out_func
    typedefs.  inflateBack() will call in(in_desc, &buf) which should return the
    number of bytes of provided input, and a pointer to that input in buf.  If
-   there is no input available, in() must return zero--buf is ignored in that
+   there is no input available, in() must return zero -- buf is ignored in that
-   case--and inflateBack() will return a buffer error.  inflateBack() will call
+   case -- and inflateBack() will return a buffer error.  inflateBack() will
-   out(out_desc, buf, len) to write the uncompressed data buf[0..len-1].  out()
+   call out(out_desc, buf, len) to write the uncompressed data buf[0..len-1].
-   should return zero on success, or non-zero on failure.  If out() returns
+   out() should return zero on success, or non-zero on failure.  If out()
-   non-zero, inflateBack() will return with an error.  Neither in() nor out()
+   returns non-zero, inflateBack() will return with an error.  Neither in() nor
-   are permitted to change the contents of the window provided to
+   out() are permitted to change the contents of the window provided to
    inflateBackInit(), which is also the buffer that out() uses to write from.
    The length written by out() will be at most the window size.  Any non-zero
    amount of input may be provided by in().
@@ -1132,7 +1192,7 @@ ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void));
      7.6: size of z_off_t
 
     Compiler, assembler, and debug options:
-     8: DEBUG
+     8: ZLIB_DEBUG
      9: ASMV or ASMINF -- use ASM code
      10: ZLIB_WINAPI -- exported functions use the WINAPI calling convention
      11: 0 (reserved)
@@ -1182,7 +1242,8 @@ ZEXTERN int ZEXPORT compress OF((Bytef *dest,   uLongf *destLen,
    the byte length of the source buffer.  Upon entry, destLen is the total size
    of the destination buffer, which must be at least the value returned by
    compressBound(sourceLen).  Upon exit, destLen is the actual size of the
-   compressed buffer.
+   compressed data.  compress() is equivalent to compress2() with a level
+   parameter of Z_DEFAULT_COMPRESSION.
 
      compress returns Z_OK if success, Z_MEM_ERROR if there was not
    enough memory, Z_BUF_ERROR if there was not enough room in the output
@@ -1198,7 +1259,7 @@ ZEXTERN int ZEXPORT compress2 OF((Bytef *dest,   uLongf *destLen,
    length of the source buffer.  Upon entry, destLen is the total size of the
    destination buffer, which must be at least the value returned by
    compressBound(sourceLen).  Upon exit, destLen is the actual size of the
-   compressed buffer.
+   compressed data.
 
      compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
    memory, Z_BUF_ERROR if there was not enough room in the output buffer,
@@ -1221,7 +1282,7 @@ ZEXTERN int ZEXPORT uncompress OF((Bytef *dest,   uLongf *destLen,
    uncompressed data.  (The size of the uncompressed data must have been saved
    previously by the compressor and transmitted to the decompressor by some
    mechanism outside the scope of this compression library.) Upon exit, destLen
-   is the actual size of the uncompressed buffer.
+   is the actual size of the uncompressed data.
 
      uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
    enough memory, Z_BUF_ERROR if there was not enough room in the output
@@ -1230,6 +1291,14 @@ ZEXTERN int ZEXPORT uncompress OF((Bytef *dest,   uLongf *destLen,
    buffer with the uncompressed data up to that point.
 */
 
+ZEXTERN int ZEXPORT uncompress2 OF((Bytef *dest,   uLongf *destLen,
+                                    const Bytef *source, uLong *sourceLen));
+/*
+     Same as uncompress, except that sourceLen is a pointer, where the
+   length of the source is *sourceLen.  On return, *sourceLen is the number of
+   source bytes consumed.
+*/
+
 /* gzip file access functions */
 
 /*
@@ -1308,10 +1377,9 @@ ZEXTERN int ZEXPORT gzbuffer OF((gzFile file, unsigned size));
    default buffer size is 8192 bytes.  This function must be called after
    gzopen() or gzdopen(), and before any other calls that read or write the
    file.  The buffer memory allocation is always deferred to the first read or
-   write.  Two buffers are allocated, either both of the specified size when
+   write.  Three times that size in buffer space is allocated.  A larger buffer
-   writing, or one of the specified size and the other twice that size when
+   size of, for example, 64K or 128K bytes will noticeably increase the speed
-   reading.  A larger buffer size of, for example, 64K or 128K bytes will
+   of decompression (reading).
-   noticeably increase the speed of decompression (reading).
 
      The new buffer size also affects the maximum length for gzprintf().
 
@@ -1322,10 +1390,12 @@ ZEXTERN int ZEXPORT gzbuffer OF((gzFile file, unsigned size));
 ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy));
 /*
      Dynamically update the compression level or strategy.  See the description
-   of deflateInit2 for the meaning of these parameters.
+   of deflateInit2 for the meaning of these parameters.  Previously provided
+   data is flushed before the parameter change.
 
-     gzsetparams returns Z_OK if success, or Z_STREAM_ERROR if the file was not
+     gzsetparams returns Z_OK if success, Z_STREAM_ERROR if the file was not
-   opened for writing.
+   opened for writing, Z_ERRNO if there is an error writing the flushed data,
+   or Z_MEM_ERROR if there is a memory allocation error.
 */
 
 ZEXTERN int ZEXPORT gzread OF((gzFile file, voidp buf, unsigned len));
@@ -1353,7 +1423,35 @@ ZEXTERN int ZEXPORT gzread OF((gzFile file, voidp buf, unsigned len));
    case.
 
      gzread returns the number of uncompressed bytes actually read, less than
-   len for end of file, or -1 for error.
+   len for end of file, or -1 for error.  If len is too large to fit in an int,
+   then nothing is read, -1 is returned, and the error state is set to
+   Z_STREAM_ERROR.
+*/
+
+ZEXTERN z_size_t ZEXPORT gzfread OF((voidp buf, z_size_t size, z_size_t nitems,
+                                     gzFile file));
+/*
+     Read up to nitems items of size size from file to buf, otherwise operating
+   as gzread() does.  This duplicates the interface of stdio's fread(), with
+   size_t request and return types.  If the library defines size_t, then
+   z_size_t is identical to size_t.  If not, then z_size_t is an unsigned
+   integer type that can contain a pointer.
+
+     gzfread() returns the number of full items read of size size, or zero if
+   the end of the file was reached and a full item could not be read, or if
+   there was an error.  gzerror() must be consulted if zero is returned in
+   order to determine if there was an error.  If the multiplication of size and
+   nitems overflows, i.e. the product does not fit in a z_size_t, then nothing
+   is read, zero is returned, and the error state is set to Z_STREAM_ERROR.
+
+     In the event that the end of file is reached and only a partial item is
+   available at the end, i.e. the remaining uncompressed data length is not a
+   multiple of size, then the final partial item is nevetheless read into buf
+   and the end-of-file flag is set.  The length of the partial item read is not
+   provided, but could be inferred from the result of gztell().  This behavior
+   is the same as the behavior of fread() implementations in common libraries,
+   but it prevents the direct use of gzfread() to read a concurrently written
+   file, reseting and retrying on end-of-file, when size is not 1.
 */
 
 ZEXTERN int ZEXPORT gzwrite OF((gzFile file,
@@ -1364,19 +1462,33 @@ ZEXTERN int ZEXPORT gzwrite OF((gzFile file,
    error.
 */
 
+ZEXTERN z_size_t ZEXPORT gzfwrite OF((voidpc buf, z_size_t size,
+                                      z_size_t nitems, gzFile file));
+/*
+     gzfwrite() writes nitems items of size size from buf to file, duplicating
+   the interface of stdio's fwrite(), with size_t request and return types.  If
+   the library defines size_t, then z_size_t is identical to size_t.  If not,
+   then z_size_t is an unsigned integer type that can contain a pointer.
+
+     gzfwrite() returns the number of full items written of size size, or zero
+   if there was an error.  If the multiplication of size and nitems overflows,
+   i.e. the product does not fit in a z_size_t, then nothing is written, zero
+   is returned, and the error state is set to Z_STREAM_ERROR.
+*/
+
 ZEXTERN int ZEXPORTVA gzprintf Z_ARG((gzFile file, const char *format, ...));
 /*
      Converts, formats, and writes the arguments to the compressed file under
    control of the format string, as in fprintf.  gzprintf returns the number of
-   uncompressed bytes actually written, or 0 in case of error.  The number of
+   uncompressed bytes actually written, or a negative zlib error code in case
-   uncompressed bytes written is limited to 8191, or one less than the buffer
+   of error.  The number of uncompressed bytes written is limited to 8191, or
-   size given to gzbuffer().  The caller should assure that this limit is not
+   one less than the buffer size given to gzbuffer().  The caller should assure
-   exceeded.  If it is exceeded, then gzprintf() will return an error (0) with
+   that this limit is not exceeded.  If it is exceeded, then gzprintf() will
-   nothing written.  In this case, there may also be a buffer overflow with
+   return an error (0) with nothing written.  In this case, there may also be a
-   unpredictable consequences, which is possible only if zlib was compiled with
+   buffer overflow with unpredictable consequences, which is possible only if
-   the insecure functions sprintf() or vsprintf() because the secure snprintf()
+   zlib was compiled with the insecure functions sprintf() or vsprintf()
-   or vsnprintf() functions were not available.  This can be determined using
+   because the secure snprintf() or vsnprintf() functions were not available.
-   zlibCompileFlags().
+   This can be determined using zlibCompileFlags().
 */
 
 ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s));
@@ -1436,7 +1548,7 @@ ZEXTERN int ZEXPORT gzflush OF((gzFile file, int flush));
      If the flush parameter is Z_FINISH, the remaining data is written and the
    gzip stream is completed in the output.  If gzwrite() is called again, a new
    gzip stream will be started in the output.  gzread() is able to read such
-   concatented gzip streams.
+   concatenated gzip streams.
 
      gzflush should be called only when strictly necessary because it will
    degrade compression if called too often.
@@ -1590,7 +1702,7 @@ ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));
    return the updated checksum.  If buf is Z_NULL, this function returns the
    required initial value for the checksum.
 
-     An Adler-32 checksum is almost as reliable as a CRC32 but can be computed
+     An Adler-32 checksum is almost as reliable as a CRC-32 but can be computed
    much faster.
 
    Usage example:
@@ -1603,6 +1715,12 @@ ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));
      if (adler != original_adler) error();
 */
 
+ZEXTERN uLong ZEXPORT adler32_z OF((uLong adler, const Bytef *buf,
+                                    z_size_t len));
+/*
+     Same as adler32(), but with a size_t length.
+*/
+
 /*
 ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2,
                                           z_off_t len2));
@@ -1632,6 +1750,12 @@ ZEXTERN uLong ZEXPORT crc32   OF((uLong crc, const Bytef *buf, uInt len));
      if (crc != original_crc) error();
 */
 
+ZEXTERN uLong ZEXPORT crc32_z OF((uLong adler, const Bytef *buf,
+                                  z_size_t len));
+/*
+     Same as crc32(), but with a size_t length.
+*/
+
 /*
 ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, z_off_t len2));
 
@@ -1662,19 +1786,35 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits,
                                          unsigned char FAR *window,
                                          const char *version,
                                          int stream_size));
-#define deflateInit(strm, level) \
+#ifdef Z_PREFIX_SET
+#  define z_deflateInit(strm, level) \
           deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream))
-#define inflateInit(strm) \
+#  define z_inflateInit(strm) \
           inflateInit_((strm), ZLIB_VERSION, (int)sizeof(z_stream))
-#define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
+#  define z_deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
           deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
                         (strategy), ZLIB_VERSION, (int)sizeof(z_stream))
-#define inflateInit2(strm, windowBits) \
+#  define z_inflateInit2(strm, windowBits) \
           inflateInit2_((strm), (windowBits), ZLIB_VERSION, \
                         (int)sizeof(z_stream))
-#define inflateBackInit(strm, windowBits, window) \
+#  define z_inflateBackInit(strm, windowBits, window) \
           inflateBackInit_((strm), (windowBits), (window), \
                            ZLIB_VERSION, (int)sizeof(z_stream))
+#else
+#  define deflateInit(strm, level) \
+          deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream))
+#  define inflateInit(strm) \
+          inflateInit_((strm), ZLIB_VERSION, (int)sizeof(z_stream))
+#  define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
+          deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
+                        (strategy), ZLIB_VERSION, (int)sizeof(z_stream))
+#  define inflateInit2(strm, windowBits) \
+          inflateInit2_((strm), (windowBits), ZLIB_VERSION, \
+                        (int)sizeof(z_stream))
+#  define inflateBackInit(strm, windowBits, window) \
+          inflateBackInit_((strm), (windowBits), (window), \
+                           ZLIB_VERSION, (int)sizeof(z_stream))
+#endif
 
 #ifndef Z_SOLO
 
@@ -1694,10 +1834,10 @@ ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file));  /* backward compatibility */
 #ifdef Z_PREFIX_SET
 #  undef z_gzgetc
 #  define z_gzgetc(g) \
-    ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc(g))
+          ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : (gzgetc)(g))
 #else
 #  define gzgetc(g) \
-    ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc(g))
+          ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : (gzgetc)(g))
 #endif
 
 /* provide 64-bit offset functions if _LARGEFILE64_SOURCE defined, and/or
@@ -1755,19 +1895,16 @@ ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t));
 
 #endif /* !Z_SOLO */
 
-/* hack for buggy compilers */
-#if !defined(ZUTIL_H) && !defined(NO_DUMMY_DECL)
-struct internal_state {int dummy;};
-#endif
-
 /* undocumented functions */
 ZEXTERN const char    *ZEXPORT zError           OF((int));
 ZEXTERN int            ZEXPORT inflateSyncPoint OF((z_streamp));
 ZEXTERN const z_crc_t FAR *ZEXPORT get_crc_table    OF((void));
 ZEXTERN int            ZEXPORT inflateUndermine OF((z_streamp, int));
+ZEXTERN int            ZEXPORT inflateValidate OF((z_streamp, int));
+ZEXTERN unsigned long  ZEXPORT inflateCodesUsed OF((z_streamp));
 ZEXTERN int            ZEXPORT inflateResetKeep OF((z_streamp));
 ZEXTERN int            ZEXPORT deflateResetKeep OF((z_streamp));
-#if defined(_WIN32) && !defined(Z_SOLO)
+#if (defined(_WIN32) || defined(__CYGWIN__)) && !defined(Z_SOLO)
 ZEXTERN gzFile         ZEXPORT gzopen_w OF((const wchar_t *path,
                                             const char *mode));
 #endif
@@ -1784,3 +1921,4 @@ ZEXTERN int            ZEXPORTVA gzvprintf Z_ARG((gzFile file,
 #endif
 
 #endif /* ZLIB_H */
+

common/zlib/zutil.c

@@ -1,5 +1,5 @@
 /* zutil.c -- target dependent utility functions for the compression library
- * Copyright (C) 1995-2005, 2010, 2011, 2012 Jean-loup Gailly.
+ * Copyright (C) 1995-2017 Jean-loup Gailly
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -10,21 +10,17 @@
 #  include "gzguts.h"
 #endif
 
-#ifndef NO_DUMMY_DECL
-struct internal_state      {int dummy;}; /* for buggy compilers */
-#endif
-
 z_const char *const z_errmsg[10] = {
-    "need dictionary",     /* Z_NEED_DICT       2  */
+    (z_const char *)"need dictionary",     /* Z_NEED_DICT       2  */
-    "stream end",          /* Z_STREAM_END      1  */
+    (z_const char *)"stream end",          /* Z_STREAM_END      1  */
-    "",                    /* Z_OK              0  */
+    (z_const char *)"",                    /* Z_OK              0  */
-    "file error",          /* Z_ERRNO         (-1) */
+    (z_const char *)"file error",          /* Z_ERRNO         (-1) */
-    "stream error",        /* Z_STREAM_ERROR  (-2) */
+    (z_const char *)"stream error",        /* Z_STREAM_ERROR  (-2) */
-    "data error",          /* Z_DATA_ERROR    (-3) */
+    (z_const char *)"data error",          /* Z_DATA_ERROR    (-3) */
-    "insufficient memory", /* Z_MEM_ERROR     (-4) */
+    (z_const char *)"insufficient memory", /* Z_MEM_ERROR     (-4) */
-    "buffer error",        /* Z_BUF_ERROR     (-5) */
+    (z_const char *)"buffer error",        /* Z_BUF_ERROR     (-5) */
-    "incompatible version",/* Z_VERSION_ERROR (-6) */
+    (z_const char *)"incompatible version",/* Z_VERSION_ERROR (-6) */
-    ""
+    (z_const char *)""
 };
 
 
@@ -84,7 +80,7 @@ uLong ZEXPORT zlibCompileFlags() {
         default:
             flags += 3 << 6;
     }
-#ifdef DEBUG
+#ifdef ZLIB_DEBUG
     flags += 1 << 8;
 #endif
 #if defined(ASMV) || defined(ASMINF)
@@ -138,8 +134,8 @@ uLong ZEXPORT zlibCompileFlags() {
     return flags;
 }
 
-#ifdef DEBUG
+#ifdef ZLIB_DEBUG
-
+#include <stdlib.h>
 #  ifndef verbose
 #    define verbose 0
 #  endif
@@ -241,9 +237,11 @@ local ptr_table table[MAX_PTR];
  */
 
 voidpf ZLIB_INTERNAL zcalloc(voidpf opaque, unsigned items, unsigned size) {
-    voidpf buf = opaque; /* just to make some compilers happy */
+    voidpf buf;
     ulg bsize = (ulg)items * size;
 
+    (void)opaque;
+
     /* If we allocate less than 65520 bytes, we assume that farmalloc
      * will return a usable pointer which doesn't have to be normalized.
      */
@@ -265,6 +263,9 @@ voidpf ZLIB_INTERNAL zcalloc(voidpf opaque, unsigned items, unsigned size) {
 
 void ZLIB_INTERNAL zcfree(voidpf opaque, voidpf ptr) {
     int n;
+
+    (void)opaque;
+
     if (*(ush *)&ptr != 0) { /* object < 64K */
         farfree(ptr);
         return;
@@ -280,7 +281,6 @@ void ZLIB_INTERNAL zcfree(voidpf opaque, voidpf ptr) {
         next_ptr--;
         return;
     }
-    ptr = opaque; /* just to make some compilers happy */
     Assert(0, "zcfree: ptr not found");
 }
 
@@ -298,12 +298,12 @@ void ZLIB_INTERNAL zcfree(voidpf opaque, voidpf ptr) {
 #endif
 
 voidpf ZLIB_INTERNAL zcalloc(voidpf opaque, uInt items, uInt size) {
-    if (opaque) opaque = 0; /* to make compiler happy */
+    (void)opaque;
     return _halloc((long)items, size);
 }
 
 void ZLIB_INTERNAL zcfree(voidpf opaque, voidpf ptr) {
-    if (opaque) opaque = 0; /* to make compiler happy */
+    (void)opaque;
     _hfree(ptr);
 }
 
@@ -325,7 +325,7 @@ voidpf opaque;
 unsigned items;
 unsigned size;
 {
-    if (opaque) items += size - size; /* make compiler happy */
+    (void)opaque;
     return sizeof(uInt) > 2 ? (voidpf)malloc(items * size) :
            (voidpf)calloc(items, size);
 }
@@ -334,10 +334,11 @@ void ZLIB_INTERNAL zcfree(opaque, ptr)
 voidpf opaque;
 voidpf ptr;
 {
+    (void)opaque;
     free(ptr);
-    if (opaque) return; /* make compiler happy */
 }
 
 #endif /* MY_ZCALLOC */
 
 #endif /* !Z_SOLO */
+

common/zlib/zutil.h

@@ -1,5 +1,5 @@
 /* zutil.h -- internal interface and configuration of the compression library
- * Copyright (C) 1995-2013 Jean-loup Gailly.
+ * Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -36,7 +36,9 @@ typedef long ptrdiff_t;  /* guess -- will be caught if guess is wrong */
 #ifndef local
 #  define local static
 #endif
-/* compile with -Dlocal if your debugger can't find static symbols */
+/* since "static" is used to mean two completely different things in C, we
+   define "local" for the non-static meaning of "static", for readability
+   (compile with -Dlocal if your debugger can't find static symbols) */
 
 typedef unsigned char  uch;
 typedef uch FAR uchf;
@@ -98,28 +100,38 @@ void *_Cdecl farmalloc(unsigned long nbytes);
 #endif
 
 #ifdef AMIGA
-#  define OS_CODE  0x01
+#  define OS_CODE  1
 #endif
 
 #if defined(VAXC) || defined(VMS)
-#  define OS_CODE  0x02
+#  define OS_CODE  2
 #  define F_OPEN(name, mode) \
      fopen((name), (mode), "mbc=60", "ctx=stm", "rfm=fix", "mrs=512")
 #endif
 
+#ifdef __370__
+#  if __TARGET_LIB__ < 0x20000000
+#    define OS_CODE 4
+#  elif __TARGET_LIB__ < 0x40000000
+#    define OS_CODE 11
+#  else
+#    define OS_CODE 8
+#  endif
+#endif
+
 #if defined(ATARI) || defined(atarist)
-#  define OS_CODE  0x05
+#  define OS_CODE  5
 #endif
 
 #ifdef OS2
-#  define OS_CODE  0x06
+#  define OS_CODE  6
 #  if defined(M_I86) && !defined(Z_SOLO)
 #    include <malloc.h>
 #  endif
 #endif
 
 #if defined(MACOS) || defined(TARGET_OS_MAC)
-#  define OS_CODE  0x07
+#  define OS_CODE  7
 #  ifndef Z_SOLO
 #    if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
 #      include <unix.h> /* for fdopen */
@@ -131,18 +143,24 @@ void *_Cdecl farmalloc(unsigned long nbytes);
 #  endif
 #endif
 
-#ifdef TOPS20
+#ifdef __acorn
-#  define OS_CODE  0x0a
+#  define OS_CODE 13
 #endif
 
-#ifdef WIN32
+#if defined(WIN32) && !defined(__CYGWIN__)
-#  ifndef __CYGWIN__  /* Cygwin is Unix, not Win32 */
+#  define OS_CODE  10
-#    define OS_CODE  0x0b
-#  endif
 #endif
 
-#ifdef __50SERIES /* Prime/PRIMOS */
+#ifdef _BEOS_
-#  define OS_CODE  0x0f
+#  define OS_CODE  16
+#endif
+
+#ifdef __TOS_OS400__
+#  define OS_CODE 18
+#endif
+
+#ifdef __APPLE__
+#  define OS_CODE 19
 #endif
 
 #if defined(_BEOS_) || defined(RISCOS)
@@ -177,7 +195,7 @@ ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
 /* common defaults */
 
 #ifndef OS_CODE
-#  define OS_CODE  0x03  /* assume Unix */
+#  define OS_CODE  3     /* assume Unix */
 #endif
 
 #ifndef F_OPEN
@@ -216,7 +234,7 @@ void ZLIB_INTERNAL zmemzero OF((Bytef *dest, uInt len));
 #endif
 
 /* Diagnostic functions */
-#ifdef DEBUG
+#ifdef ZLIB_DEBUG
 #  include <stdio.h>
 extern int ZLIB_INTERNAL z_verbose;
 extern void ZLIB_INTERNAL z_error OF((char *m));
@@ -251,3 +269,4 @@ void ZLIB_INTERNAL zcfree  OF((voidpf opaque, voidpf ptr));
                     (((q) & 0xff00) << 8) + (((q) & 0xff) << 24))
 
 #endif /* ZUTIL_H */
+

doc/extensions_notes.md

@@ -7,7 +7,7 @@ The Proxmark3 client uses a wide range of files. Here is a brief recap to get yo
 | .exe | windows executable |
 | .bin | binary file,  can be firmware or memory dump of a tag |
 | .eml | text file, with memory dump of a tag |
-| .mfd | binary file,  usually created with Mifare Classic Tool app (MCT),  contains memory dump of tag. Very similar to .bin file |
+| .mfd | binary file, MIFARE file dump, name comes from NFC-Tools. Usually created with Mifare Classic Tool app (MCT) or NFC-Tools,  contains memory dump of tag. Very similar to .bin file |
 | .json | JSON file, usually settings file or it can also be a memory dump of a tag |
 | .dic | dictionary file. textual, with keys/passwords one line / key |
 | .elf | binary proxmark3 device firmware file. |
@@ -15,3 +15,5 @@ The Proxmark3 client uses a wide range of files. Here is a brief recap to get yo
 | .lua | text file, contains lua script to be run inside client.  or called with -l |
 | .pm3 | text file, with numbers ranging 0-255 or -127 - 128.  Contains trace signal data for low frequency tags (data load) |
 | .trace | binary file,  contains trace log data usually from high frequency tags.  (hw trace load) |
+| .log | text file, our log file, contains the output from almost all commands you run inside Proxmark3 client |
+| .history | text file, our command log file, contains the commands you ran inside Proxmark3 client |

doc/md/Installation_Instructions/Linux-Installation-Instructions.md

@@ -9,7 +9,7 @@ You might want to follow one of these external resources to get an overview, but
 ![Linux Installation Video Screenshot](https://github.com/5w0rdfish/Proxmark3-RDV4-ParrotOS/blob/master/screenshot-www.youtube.com-2019.03.17-20-44-33.png)
 
 * ParrotOS: some further notes can be found at @5w0rdfish repo [Proxmark Installation for Parrot OS](https://github.com/5w0rdfish/Proxmark3-RDV4-ParrotOS)
-* Iceman has also added this script to the fork. https://github.com/RfidResearchGroup/proxmark3/blob/master/install.sh
+
 
 # Install the required dependencies
 

doc/md/Installation_Instructions/Windows-Installation-Instructions.md

@@ -68,6 +68,8 @@ Install WSL with e.g. the standard Ubuntu.
 
 For WSL configuration, see [Manage and configure Windows Subsystem for Linux](https://docs.microsoft.com/en-us/windows/wsl/wsl-config).
 
+Make sure your WSL can launch Windows processes to get the `pm3` scripts working (cf `interop` in the WSL settings).
+
 ## X Server Installation
 
 If you want to run the graphical components of the Proxmark3 client, you need to install a X Server such as [VcXsrv](https://sourceforge.net/projects/vcxsrv/) or [Xming](https://sourceforge.net/projects/xming/) and launch it, e.g. by executing XLaunch.

include/pm3_cmd.h

@@ -442,6 +442,7 @@ typedef struct {
 // For measurements of the antenna tuning
 #define CMD_MEASURE_ANTENNA_TUNING                                        0x0400
 #define CMD_MEASURE_ANTENNA_TUNING_HF                                     0x0401
+#define CMD_MEASURE_ANTENNA_TUNING_LF                                     0x0402
 #define CMD_LISTEN_READER_FIELD                                           0x0420
 #define CMD_HF_DROPFIELD                                                  0x0430
 

pm3

@@ -54,6 +54,13 @@ function wait4proxmark_Windows {
 }
 
 function wait4proxmark_WSL {
+    # Test presence of wmic
+    wmic.exe computersystem get name >/dev/null 2>&1
+    if [ $? -ne 0 ]; then
+        echo "[!] Cannot run wmic.exe, are you sure your WSL is authorized to run Windows processes? (cf WSL interop flag)"
+        exit 1
+    fi
+
     echo >&2 "[=] Waiting for Proxmark3 to appear..."
     while true; do
         device=$(wmic.exe path Win32_SerialPort where "PNPDeviceID like '%VID_9AC4&PID_4B8F%'" get DeviceID,PNPDeviceID 2>/dev/null | awk 'NR==2')

tools/pm3_pm32wav.py

@@ -0,0 +1,35 @@
+#!/usr/bin/env python3
+
+# Simple script to convert pm3 traces to something audible
+sampleRate = 16000.0 # hertz, so we're scaling the 125kHz to 16kHz
+default_repeat = 10
+
+import sys
+import numpy as np
+import wave
+import struct
+
+with open(sys.argv[1]) as pm3:
+  data = np.fromfile(pm3, dtype=int, sep="\n")
+
+if len(sys.argv) > 2:
+  repeat = int(sys.argv[2], 10)
+else:
+  repeat = default_repeat
+
+ofile = sys.argv[1].replace('pm3', 'wav')
+if ofile == sys.argv[1]:
+    ofile = sys.argv[1]+'.wav'
+obj = wave.open(ofile,'w')
+obj.setnchannels(1) # mono
+obj.setsampwidth(2)
+obj.setframerate(sampleRate)
+factor = (2**16)//512
+for i in range(repeat):
+   for d in data:
+       try:
+           obj.writeframesraw( struct.pack('<h', d*factor) )
+       except:
+           print("B:" , d, d*factor)
+           raise
+obj.close()