From c95affa8d3d84f0bd5db7821f65c22e13870d4e2 Mon Sep 17 00:00:00 2001
From: Oleg Moiseenko <olegmsn@gmail.com>
Date: Wed, 15 Nov 2017 08:49:18 +0200
Subject: [PATCH] minor fixes
* fix timeout set in PR #481
* fix warning in util.c printf
---
client/cmdhf14a.c | 4 ++--
client/util.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index 4b3975b3..50071464 100644
--- 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
- // 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);
diff --git a/client/util.c b/client/util.c
index de62ac79..a1caafdb 100644
--- 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) {
- 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;
}
--
2.39.5