From eba3b97a165193548876bb599f9fe7ebe65d0edc Mon Sep 17 00:00:00 2001 From: merlokk Date: Wed, 6 Dec 2017 18:12:13 +0200 Subject: [PATCH] move emv crypto tests to folder `client/emv/test` --- client/Makefile | 10 +++++----- client/emv/cmdemv.c | 4 ++-- client/emv/crypto_polarssl.c | 3 +++ client/emv/{ => test}/cda_test.c | 10 +++++----- client/emv/{ => test}/cda_test.h | 0 client/emv/{ => test}/crypto_test.c | 4 ++-- client/emv/{ => test}/crypto_test.h | 0 client/emv/{ => test}/cryptotest.c | 0 client/emv/{ => test}/cryptotest.h | 0 client/emv/{ => test}/dda_test.c | 10 +++++----- client/emv/{ => test}/dda_test.h | 0 client/emv/{ => test}/sda_test.c | 10 +++++----- client/emv/{ => test}/sda_test.h | 0 client/obj/emv/test/.dummy | 0 14 files changed, 27 insertions(+), 24 deletions(-) rename client/emv/{ => test}/cda_test.c (99%) rename client/emv/{ => test}/cda_test.h (100%) rename client/emv/{ => test}/crypto_test.c (99%) rename client/emv/{ => test}/crypto_test.h (100%) rename client/emv/{ => test}/cryptotest.c (100%) rename client/emv/{ => test}/cryptotest.h (100%) rename client/emv/{ => test}/dda_test.c (99%) rename client/emv/{ => test}/dda_test.h (100%) rename client/emv/{ => test}/sda_test.c (98%) rename client/emv/{ => test}/sda_test.h (100%) create mode 100644 client/obj/emv/test/.dummy diff --git a/client/Makefile b/client/Makefile index 5322229a..fe497f0a 100644 --- a/client/Makefile +++ b/client/Makefile @@ -115,17 +115,17 @@ CMDSRCS = crapto1/crapto1.c\ emv/emv_pk.c\ emv/emv_pki.c\ emv/emv_pki_priv.c\ - emv/cryptotest.c\ + emv/test/cryptotest.c\ emv/apduinfo.c\ emv/dump.c\ emv/tlv.c\ emv/emv_tags.c\ emv/dol.c\ emv/emvcore.c\ - emv/crypto_test.c\ - emv/sda_test.c\ - emv/dda_test.c\ - emv/cda_test.c\ + emv/test/crypto_test.c\ + emv/test/sda_test.c\ + emv/test/dda_test.c\ + emv/test/cda_test.c\ emv/cmdemv.c\ cmdhf.c \ cmdhf14a.c \ diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c index 108fc727..75f1de60 100644 --- a/client/emv/cmdemv.c +++ b/client/emv/cmdemv.c @@ -9,7 +9,7 @@ //----------------------------------------------------------------------------- #include "cmdemv.h" -#include "cryptotest.h" +#include "test/cryptotest.h" int UsageCmdHFEMVSelect(void) { PrintAndLog("HELP : Executes select applet command:\n"); @@ -437,7 +437,7 @@ int CmdHFEMVExec(const char *cmd) { TLV_ADD(0x9F66, "\x26\x00\x00\x00"); // qVSDC break; case TT_CDA: - TLV_ADD(0x9F66, "\x86\x80\x00\x00"); // CDA + TLV_ADD(0x9F66, "\x26\x80\x00\x00"); // CDA break; default: TLV_ADD(0x9F66, "\x26\x00\x00\x00"); // qVSDC diff --git a/client/emv/crypto_polarssl.c b/client/emv/crypto_polarssl.c index 49ac3188..349f7fd8 100644 --- a/client/emv/crypto_polarssl.c +++ b/client/emv/crypto_polarssl.c @@ -178,6 +178,9 @@ static struct crypto_pk *crypto_pk_polarssl_genkey_rsa(va_list vl) unsigned int nbits = va_arg(vl, unsigned int); unsigned int exp = va_arg(vl, unsigned int); + if (transient) { + } + int res = rsa_gen_key(&cp->ctx, &myrand, NULL, nbits, exp); if (res) { fprintf(stderr, "PolarSSL private key generation error res=%x exp=%d nbits=%d.\n", res * -1, exp, nbits); diff --git a/client/emv/cda_test.c b/client/emv/test/cda_test.c similarity index 99% rename from client/emv/cda_test.c rename to client/emv/test/cda_test.c index c0d79fee..536a5862 100644 --- a/client/emv/cda_test.c +++ b/client/emv/test/cda_test.c @@ -17,11 +17,11 @@ #include #endif -#include "emv_pk.h" -#include "crypto.h" -#include "dump.h" -#include "tlv.h" -#include "emv_pki.h" +#include "../emv_pk.h" +#include "../crypto.h" +#include "../dump.h" +#include "../tlv.h" +#include "../emv_pki.h" #include #include diff --git a/client/emv/cda_test.h b/client/emv/test/cda_test.h similarity index 100% rename from client/emv/cda_test.h rename to client/emv/test/cda_test.h diff --git a/client/emv/crypto_test.c b/client/emv/test/crypto_test.c similarity index 99% rename from client/emv/crypto_test.c rename to client/emv/test/crypto_test.c index 68e25ea4..ff18b9da 100644 --- a/client/emv/crypto_test.c +++ b/client/emv/test/crypto_test.c @@ -17,8 +17,8 @@ #include #endif -#include "crypto.h" -#include "dump.h" +#include "../crypto.h" +#include "../dump.h" #include "util_posix.h" #include diff --git a/client/emv/crypto_test.h b/client/emv/test/crypto_test.h similarity index 100% rename from client/emv/crypto_test.h rename to client/emv/test/crypto_test.h diff --git a/client/emv/cryptotest.c b/client/emv/test/cryptotest.c similarity index 100% rename from client/emv/cryptotest.c rename to client/emv/test/cryptotest.c diff --git a/client/emv/cryptotest.h b/client/emv/test/cryptotest.h similarity index 100% rename from client/emv/cryptotest.h rename to client/emv/test/cryptotest.h diff --git a/client/emv/dda_test.c b/client/emv/test/dda_test.c similarity index 99% rename from client/emv/dda_test.c rename to client/emv/test/dda_test.c index 6c1bc307..afdd4e20 100644 --- a/client/emv/dda_test.c +++ b/client/emv/test/dda_test.c @@ -19,11 +19,11 @@ #include "dda_test.h" -#include "emv_pk.h" -#include "crypto.h" -#include "dump.h" -#include "tlv.h" -#include "emv_pki.h" +#include "../emv_pk.h" +#include "../crypto.h" +#include "../dump.h" +#include "../tlv.h" +#include "../emv_pki.h" #include #include diff --git a/client/emv/dda_test.h b/client/emv/test/dda_test.h similarity index 100% rename from client/emv/dda_test.h rename to client/emv/test/dda_test.h diff --git a/client/emv/sda_test.c b/client/emv/test/sda_test.c similarity index 98% rename from client/emv/sda_test.c rename to client/emv/test/sda_test.c index 654e2fd4..2aafcf19 100644 --- a/client/emv/sda_test.c +++ b/client/emv/test/sda_test.c @@ -17,11 +17,11 @@ #include #endif -#include "emv_pk.h" -#include "crypto.h" -#include "dump.h" -#include "tlv.h" -#include "emv_pki.h" +#include "../emv_pk.h" +#include "../crypto.h" +#include "../dump.h" +#include "../tlv.h" +#include "../emv_pki.h" #include #include diff --git a/client/emv/sda_test.h b/client/emv/test/sda_test.h similarity index 100% rename from client/emv/sda_test.h rename to client/emv/test/sda_test.h diff --git a/client/obj/emv/test/.dummy b/client/obj/emv/test/.dummy new file mode 100644 index 00000000..e69de29b