X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/0bb514502a1d80e9b023d0e8a379f3559798eec2..a4ff62be63ca2a81071e9aa2b882bd3ff57f13ad:/client/cmdhffido.c?ds=sidebyside

diff --git a/client/cmdhffido.c b/client/cmdhffido.c
index 9c812860..25862445 100644
--- a/client/cmdhffido.c
+++ b/client/cmdhffido.c
@@ -40,6 +40,7 @@
 #include "emv/emvcore.h"
 #include "emv/emvjson.h"
 #include "emv/dump.h"
+#include "emv/apduinfo.h"
 #include "cliparser/cliparser.h"
 #include "crypto/asn1utils.h"
 #include "crypto/libpcrypto.h"
@@ -61,7 +62,7 @@ int CmdHFFidoInfo(const char *cmd) {
 	PrintAndLog("--------------------------------------------"); 
 	SetAPDULogging(false);
 	
-	uint8_t buf[APDU_RES_LEN] = {0};
+	uint8_t buf[APDU_RESPONSE_LEN] = {0};
 	size_t len = 0;
 	uint16_t sw = 0;
 	int res = FIDOSelect(true, true, buf, sizeof(buf), &len, &sw);
@@ -352,9 +353,9 @@ int CmdHFFidoRegister(const char *cmd) {
 			&buf[1], 65,             // user public key
 			NULL, 0);
 		//PrintAndLog("--xbuf(%d)[%d]: %s", res, xbuflen, sprint_hex(xbuf, xbuflen));
-		res = ecdsa_signature_verify(public_key, xbuf, xbuflen, &buf[hashp], len - hashp);
+		res = ecdsa_signature_verify(MBEDTLS_ECP_DP_SECP256R1, public_key, xbuf, xbuflen, &buf[hashp], len - hashp, true);
 		if (res) {
-			if (res == -0x4e00) {
+			if (res == MBEDTLS_ERR_ECP_VERIFY_FAILED) {
 				PrintAndLog("Signature is NOT VALID.");
 			} else {
 				PrintAndLog("Other signature check error: %x %s", (res<0)?-res:res, ecdsa_get_error(res));
@@ -578,9 +579,9 @@ int CmdHFFidoAuthenticate(const char *cmd) {
 				data, 32,      // challenge parameter
 				NULL, 0);
 			//PrintAndLog("--xbuf(%d)[%d]: %s", res, xbuflen, sprint_hex(xbuf, xbuflen));
-			res = ecdsa_signature_verify(public_key, xbuf, xbuflen, &buf[5], len - 5);
+			res = ecdsa_signature_verify(MBEDTLS_ECP_DP_SECP256R1, public_key, xbuf, xbuflen, &buf[5], len - 5, true);
 			if (res) {
-				if (res == -0x4e00) {
+				if (res == MBEDTLS_ERR_ECP_VERIFY_FAILED) {
 					PrintAndLog("Signature is NOT VALID.");
 				} else {
 					PrintAndLog("Other signature check error: %x %s", (res<0)?-res:res, ecdsa_get_error(res));