Merge branch 'master' into fix_iclass_sim

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

diff --git a/client/emv/test/cryptotest.c b/client/emv/test/cryptotest.c
index 1d5891fe06cae649f3166b710cdd3642de17ce2c..58cbdd4b9692055d5b0ddd18d2b1038e2b001282 100644 (file)
--- a/client/emv/test/cryptotest.c
+++ b/client/emv/test/cryptotest.c
@@ -31,6 +31,7 @@
 #include "dda_test.h"
 #include "cda_test.h"
 #include "crypto/libpcrypto.h"
 #include "dda_test.h"
 #include "cda_test.h"
 #include "crypto/libpcrypto.h"

+#include "emv/emv_roca.h"

 
 int ExecuteCryptoTests(bool verbose) {
        int res;
 
 int ExecuteCryptoTests(bool verbose) {
        int res;


@@ -90,11 +91,14 @@ int ExecuteCryptoTests(bool verbose) {
        res = exec_crypto_test(verbose);
        if (res) TestFail = true;
 
        res = exec_crypto_test(verbose);
        if (res) TestFail = true;
 

+       res = roca_self_test();
+       if (res) TestFail = true;
+

        PrintAndLog("\n--------------------------");
        if (TestFail)
        PrintAndLog("\n--------------------------");
        if (TestFail)

-               PrintAndLog("Test(s) [ERROR].");
+               PrintAndLogEx(FAILED, "\tTest(s) [ %s ]", _RED_(FAIL) );

        else
        else

-               PrintAndLog("Tests [OK].");
+               PrintAndLogEx(SUCCESS, "\tTest(s) [ %s ]", _GREEN_(OK) );

        
        return TestFail;
 }
        
        return TestFail;
 }