X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/c8a0f5503172f25620670a9ba992d8c923b5df95..01aa068b6ff34d86dd5d9d9e962aba20cd490050:/client/emv/test/cryptotest.c

diff --git a/client/emv/test/cryptotest.c b/client/emv/test/cryptotest.c
index b778d256..58cbdd4b 100644
--- a/client/emv/test/cryptotest.c
+++ b/client/emv/test/cryptotest.c
@@ -12,38 +12,71 @@
 #include "util.h"
 #include "ui.h"
 
-#include "bignum.h"
-#include "aes.h"
-#include "aes_cmac128.h"
-#include "des.h"
-#include "rsa.h"
-#include "sha1.h"
+#include "mbedtls/bignum.h"
+#include "mbedtls/aes.h"
+#include "mbedtls/cmac.h"
+#include "mbedtls/des.h"
+#include "mbedtls/ecp.h"
+#include "mbedtls/rsa.h"
+#include "mbedtls/sha1.h"
+#include "mbedtls/md5.h"
+#include "mbedtls/x509.h"
+#include "mbedtls/base64.h"
+#include "mbedtls/ctr_drbg.h"
+#include "mbedtls/entropy.h"
+#include "mbedtls/timing.h"
 
 #include "crypto_test.h"
 #include "sda_test.h"
 #include "dda_test.h"
 #include "cda_test.h"
+#include "crypto/libpcrypto.h"
+#include "emv/emv_roca.h"
 
 int ExecuteCryptoTests(bool verbose) {
 	int res;
 	bool TestFail = false;
 	
-	res = mpi_self_test(verbose);
+	res = mbedtls_mpi_self_test(verbose);
 	if (res) TestFail = true;
 	
-	res = aes_self_test(verbose);
+	res = mbedtls_aes_self_test(verbose);
 	if (res) TestFail = true;
 
-	res = aes_cmac_self_test(verbose);
+	res = mbedtls_des_self_test(verbose);
+	if (res) TestFail = true;
+	
+	res = mbedtls_sha1_self_test(verbose);
 	if (res) TestFail = true;
 
-	res = des_self_test(verbose);
+	res = mbedtls_md5_self_test(verbose);
 	if (res) TestFail = true;
 	
-	res = sha1_self_test(verbose);
+	res = mbedtls_rsa_self_test(verbose);
 	if (res) TestFail = true;
 	
-	res = rsa_self_test(verbose);
+	res = mbedtls_entropy_self_test(verbose);
+	if (res) TestFail = true;
+
+	res = mbedtls_timing_self_test(verbose);
+	if (res) TestFail = true;
+
+	res = mbedtls_ctr_drbg_self_test(verbose);
+	if (res) TestFail = true;
+	
+	res = mbedtls_base64_self_test(verbose);
+	if (res) TestFail = true;
+
+	res = mbedtls_cmac_self_test(verbose);
+	if (res) TestFail = true;
+
+	res = ecdsa_nist_test(verbose);
+	if (res) TestFail = true;
+
+	res = mbedtls_ecp_self_test(verbose);
+	if (res) TestFail = true;
+
+	res = mbedtls_x509_self_test(verbose);
 	if (res) TestFail = true;
 	
 	res = exec_sda_test(verbose);
@@ -58,11 +91,14 @@ int ExecuteCryptoTests(bool verbose) {
 	res = exec_crypto_test(verbose);
 	if (res) TestFail = true;
 
+	res = roca_self_test();
+	if (res) TestFail = true;
+
 	PrintAndLog("\n--------------------------");
 	if (TestFail)
-		PrintAndLog("Test(s) [ERROR].");
+		PrintAndLogEx(FAILED, "\tTest(s) [ %s ]", _RED_(FAIL) );
 	else
-		PrintAndLog("Tests [OK].");
+		PrintAndLogEx(SUCCESS, "\tTest(s) [ %s ]", _GREEN_(OK) );
 	
 	return TestFail;
 }