RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-01-09 09:39:16 +08:00
Code Issues Projects Releases Packages Wiki Activity

add ignoring results of some tests

Browse source
This commit is contained in:
merlokk 2019-09-16 17:37:18 +03:00
parent f7ae7f44ca
commit c5ea6b54ce
3 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
client/emv/cmdemv.c
View file

@ -1714,8 +1714,21 @@ static int CmdEMVList(const char *Cmd) {
} }
static int CmdEMVTest(const char *Cmd) { static int CmdEMVTest(const char *Cmd) {
(void)Cmd; // Cmd is not used so far CLIParserInit("emv test",
return ExecuteCryptoTests(true); "Executes tests\n",
"Usage:\n\temv test\n");
void *argtable[] = {
arg_param_begin,
arg_lit0("iI", "ignore", "ignore timing tests for VM"),
arg_param_end
};
CLIExecWithReturn(Cmd, argtable, true);
bool ignoreTimeTest = arg_get_lit(1);
CLIParserFree();
return ExecuteCryptoTests(true, ignoreTimeTest);
} }
static int CmdEMVRoca(const char *Cmd) { static int CmdEMVRoca(const char *Cmd) {

6
client/emv/test/cryptotest.c
View file

@ -33,7 +33,7 @@
#include "crypto/libpcrypto.h" #include "crypto/libpcrypto.h"
#include "emv/emv_roca.h" #include "emv/emv_roca.h"
int ExecuteCryptoTests(bool verbose) { int ExecuteCryptoTests(bool verbose, bool ignore_time) {
int res; int res;
bool TestFail = false; bool TestFail = false;
@ -56,7 +56,7 @@ int ExecuteCryptoTests(bool verbose) {
if (res) TestFail = true; if (res) TestFail = true;
res = mbedtls_entropy_self_test(verbose); res = mbedtls_entropy_self_test(verbose);
if (res) TestFail = true; if (res && !ignore_time) TestFail = true;
// retry for CI (when resources too low) // retry for CI (when resources too low)
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {
@ -65,7 +65,7 @@ int ExecuteCryptoTests(bool verbose) {
break; break;
PrintAndLogEx(WARNING, "Repeat timing test %d", i + 1); PrintAndLogEx(WARNING, "Repeat timing test %d", i + 1);
} }
if (res) TestFail = true; if (res && !ignore_time) TestFail = true;
res = mbedtls_ctr_drbg_self_test(verbose); res = mbedtls_ctr_drbg_self_test(verbose);
if (res) TestFail = true; if (res) TestFail = true;

2
client/emv/test/cryptotest.h
View file

@ -12,5 +12,5 @@
#define __CRYPTOTEST_H #define __CRYPTOTEST_H
#include <stdbool.h> #include <stdbool.h>
int ExecuteCryptoTests(bool verbose); int ExecuteCryptoTests(bool verbose, bool ignore_time);
#endif #endif