X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/314a9b9cdd3d0e45bef3158e0a40de8568edf236..437035a75b2737d0b36886bc2bacaeb0219c6325:/client/emv/emv_pki.c

diff --git a/client/emv/emv_pki.c b/client/emv/emv_pki.c
index 7803060e..da102291 100644
--- a/client/emv/emv_pki.c
+++ b/client/emv/emv_pki.c
@@ -27,6 +27,11 @@
 #include <string.h>
 #include <stdarg.h>
 
+static bool strictExecution = true;
+void PKISetStrictExecution(bool se) {
+	strictExecution = se;
+}
+
 static const unsigned char empty_tlv_value[] = {};
 static const struct tlv empty_tlv = {.tag = 0x0, .len = 0, .value = empty_tlv_value};
 
@@ -53,7 +58,7 @@ static unsigned char *emv_pki_decode_message(const struct emv_pk *enc_pk,
 	}
 
 	if (cert_tlv->len != enc_pk->mlen) {
-		printf("ERROR: Certificate length (%d) not equal key length (%d)\n", cert_tlv->len, enc_pk->mlen);
+		printf("ERROR: Certificate length (%zd) not equal key length (%zd)\n", cert_tlv->len, enc_pk->mlen);
 		return NULL;
 	}
 	kcp = crypto_pk_open(enc_pk->pk_algo,
@@ -108,9 +113,12 @@ static unsigned char *emv_pki_decode_message(const struct emv_pk *enc_pk,
 		printf("ERROR: Calculated wrong hash\n");
 		printf("decoded:    %s\n",sprint_hex(data + data_len - 1 - hash_len, hash_len));
 		printf("calculated: %s\n",sprint_hex(crypto_hash_read(ch), hash_len));
-		crypto_hash_close(ch);
-		free(data);
-		return NULL;
+		
+		if (strictExecution) {
+			crypto_hash_close(ch);
+			free(data);
+			return NULL;
+		}
 	}
 
 	crypto_hash_close(ch);
@@ -451,7 +459,7 @@ struct tlvdb *emv_pki_perform_cda_ex(const struct emv_pk *enc_pk, const struct t
 			un_tlv,
 			NULL);
 	if (!data || data_len < 3) {
-		printf("ERROR: can't decode message. len %d\n", data_len);
+		printf("ERROR: can't decode message. len %zd\n", data_len);
 		return NULL;
 	}