CHG: used @marshmellow42 's version to fix lf continuous demod problems.

[proxmark3-svn] / client / cmdhfmfhard.c

diff --git a/client/cmdhfmfhard.c b/client/cmdhfmfhard.c
index f9c1415c63937f7b28ca290b316ce7f60c001826..3fed7c95b05e546c6a16de830ebb4775ddeee685 100644 (file)
--- a/client/cmdhfmfhard.c
+++ b/client/cmdhfmfhard.c
@@ -803,7 +803,7 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_
                while(!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
                        timeout++;
                        printf(".");
                while(!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
                        timeout++;
                        printf(".");

-                       if (timeout > 7) {
+                       if (timeout > 3) {

                                PrintAndLog("\nNo response from Proxmark. Aborting...");
                                if (fnonces) fclose(fnonces);
                                return 1;
                                PrintAndLog("\nNo response from Proxmark. Aborting...");
                                if (fnonces) fclose(fnonces);
                                return 1;


@@ -1788,6 +1788,10 @@ int mfnestedhard(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBloc
                } else { // acquire nonces.
                        uint16_t is_OK = acquire_nonces(blockNo, keyType, key, trgBlockNo, trgKeyType, nonce_file_write, slow);
                        if (is_OK != 0) {
                } else { // acquire nonces.
                        uint16_t is_OK = acquire_nonces(blockNo, keyType, key, trgBlockNo, trgKeyType, nonce_file_write, slow);
                        if (is_OK != 0) {

+                               free_nonces_memory();
+                               //free_statelist_cache();
+                               free_candidates_memory(candidates);
+                               candidates = NULL;

                                return is_OK;
                        }
                }
                                return is_OK;
                        }
                }