minor fixes

* fix timeout set in PR #481
* fix warning in util.c printf

diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index 4b3975b313e4ca53ba21a47e18bbf4f18cfdbad5..5007146422ff19ee85a2d56ddd649d9a310c09fa 100644 (file)
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -660,8 +660,8 @@ int ExchangeAPDU14a(uint8_t *datain, int datainlen, bool activateField, bool lea
        // "Command APDU" length should be 5+255+1, but javacard's APDU buffer might be smaller - 133 bytes
        // https://stackoverflow.com/questions/32994936/safe-max-java-card-apdu-data-command-and-respond-size
        // here length USB_CMD_DATA_SIZE=512
        // "Command APDU" length should be 5+255+1, but javacard's APDU buffer might be smaller - 133 bytes
        // https://stackoverflow.com/questions/32994936/safe-max-java-card-apdu-data-command-and-respond-size
        // here length USB_CMD_DATA_SIZE=512

-       // timeout timeout14a * 1.06 / 100, true, size, &keyBlock[6 * c], e_sector); // timeout is (ms * 106)/10 or us*0.0106
-       UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_APDU | ISO14A_SET_TIMEOUT | cmdc, (datainlen & 0xFFFF), 1000 * 1000 * 1.06 / 100}}; 
+       // timeout must be authomatically set by "get ATS"
+       UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_APDU | cmdc, (datainlen & 0xFFFF), 0}}; 

        memcpy(c.d.asBytes, datain, datainlen);
        SendCommand(&c);
        
        memcpy(c.d.asBytes, datain, datainlen);
        SendCommand(&c);
        

diff --git a/client/util.c b/client/util.c
index de62ac7929314ba11dae46d5f2f0e057b7d75f6a..a1caafdbf9ec925561e905aa306785a5c453690d 100644 (file)
--- a/client/util.c
+++ b/client/util.c
@@ -541,7 +541,7 @@ int param_getstr(const char *line, int paramnum, char * str, size_t buffersize)
 
        // Prevent out of bounds errors
        if (en - bg + 1 >= buffersize) {
 
        // Prevent out of bounds errors
        if (en - bg + 1 >= buffersize) {

-               printf("out of bounds error: want %lu bytes have %lu bytes\n", en - bg + 1 + 1, buffersize);
+               printf("out of bounds error: want %d bytes have %zd bytes\n", en - bg + 1 + 1, buffersize);

                return 0;
        }
        
                return 0;
        }