EVM fixes and additions (RRG repository PRs 78-82 by @merlokk) (#776)

[proxmark3-svn] / client / emv / test / cryptotest.c

diff --git a/client/emv/test/cryptotest.c b/client/emv/test/cryptotest.c
index a6d06e6891c2bf0b0feada74997a3cb2c9c4aa54..58cbdd4b9692055d5b0ddd18d2b1038e2b001282 100644 (file)
--- a/client/emv/test/cryptotest.c
+++ b/client/emv/test/cryptotest.c
@@ -12,34 +12,71 @@
 #include "util.h"
 #include "ui.h"
 
-#include "bignum.h"
-#include "aes.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 = mbedtls_des_self_test(verbose);
+       if (res) TestFail = true;
+       
+       res = mbedtls_sha1_self_test(verbose);
+       if (res) TestFail = true;
+
+       res = mbedtls_md5_self_test(verbose);
        if (res) TestFail = true;
        
-       res = des_self_test(verbose);
+       res = mbedtls_rsa_self_test(verbose);
        if (res) TestFail = true;
        
-       res = sha1_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 = rsa_self_test(verbose);
+       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);
@@ -54,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;
 }