github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-08-22 14:13:42 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactoring tests execution

Browse source
This commit is contained in:
merlokk 2017-12-05 11:49:11 +02:00
commit 3b2709a44a
4 changed files with 39 additions and 106 deletions
Download patch file Download diff file Expand all files Collapse all files

1
client/Makefile
View file

@ -115,6 +115,7 @@ CMDSRCS = crapto1/crapto1.c\
emv/emv_pk.c\
emv/emv_pki.c\
emv/emv_pki_priv.c\
emv/cryptotest.c\
emv/apduinfo.c\
emv/dump.c\
emv/tlv.c\

37
client/emv/cmdemv.c
View file

@ -9,12 +9,7 @@
//-----------------------------------------------------------------------------
#include "cmdemv.h"
#include "sda_test.h"
#include "bignum.h"
#include "aes.h"
#include "des.h"
#include "rsa.h"
#include "sha1.h"
#include "cryptotest.h"
int UsageCmdHFEMVSelect(void) {
PrintAndLog("HELP : Executes select applet command:\n");
@ -786,35 +781,7 @@ int CmdHFEMVExec(const char *cmd) {
}
int CmdHFEMVTest(const char *cmd) {
int res;
bool TestFail = false;
res = mpi_self_test(true);
if (res) TestFail = true;
res = aes_self_test(true);
if (res) TestFail = true;
// res = des_self_test(true);
// if (res) TestFail = true;
res = sha1_self_test(true);
if (res) TestFail = true;
res = rsa_self_test(true);
if (res) TestFail = true;
res = exec_sda_test();
if (res) TestFail = true;
PrintAndLog("--------------------------");
if (TestFail)
PrintAndLog("One of tests is FAILED.");
else
PrintAndLog("Tests is PASSED.");
return 0;
return ExecuteCryptoTests();
}
int CmdHelp(const char *Cmd);

93
client/emv/crypto_polarssl.c
View file

@ -221,88 +221,53 @@ static struct crypto_pk *crypto_pk_polarssl_genkey_rsa(va_list vl)
static void crypto_pk_polarssl_close(struct crypto_pk *_cp)
{
struct crypto_pk_polarssl *cp = malloc(sizeof(*cp));
struct crypto_pk_polarssl *cp = (struct crypto_pk_polarssl *)_cp;
rsa_free(&cp->ctx);
free(cp);
}
static int myrand(void *rng_state, unsigned char *output, size_t len) {
size_t i;
if(rng_state != NULL)
rng_state = NULL;
for(i = 0; i < len; ++i)
output[i] = rand();
return 0;
}
static unsigned char *crypto_pk_polarssl_encrypt(const struct crypto_pk *_cp, const unsigned char *buf, size_t len, size_t *clen)
{
/*struct crypto_pk_polarssl *cp = container_of(_cp, struct crypto_pk_libgcrypt, cp);
gcry_error_t err;
int blen = len;
gcry_sexp_t dsexp, esexp, asexp;
gcry_mpi_t tmpi;
size_t templen;
size_t keysize;
struct crypto_pk_polarssl *cp = (struct crypto_pk_polarssl *)_cp;
int res;
unsigned char *result;
err = gcry_sexp_build(&dsexp, NULL, "(data (flags raw) (value %b))",
blen, buf);
if (err) {
fprintf(stderr, "LibGCrypt error %s/%s\n",
gcry_strsource (err),
gcry_strerror (err));
return NULL;
}
size_t keylen = mpi_size(&cp->ctx.N);
err = gcry_pk_encrypt(&esexp, dsexp, cp->pk);
gcry_sexp_release(dsexp);
if (err) {
fprintf(stderr, "LibGCrypt error %s/%s\n",
gcry_strsource (err),
gcry_strerror (err));
return NULL;
}
asexp = gcry_sexp_find_token(esexp, "a", 1);
gcry_sexp_release(esexp);
if (!asexp)
return NULL;
tmpi = gcry_sexp_nth_mpi(asexp, 1, GCRYMPI_FMT_USG);
gcry_sexp_release(asexp);
if (!tmpi)
return NULL;
keysize = (gcry_pk_get_nbits(cp->pk) + 7) / 8;
result = malloc(keysize);
result = malloc(keylen);
if (!result) {
gcry_mpi_release(tmpi);
printf("RSA encrypt failed. Can't allocate result memory.\n");
return NULL;
}
printf("## RSA len %d\n", keylen);
res = rsa_pkcs1_encrypt(&cp->ctx, &myrand, NULL, RSA_PUBLIC, len, buf, result);
if(res) {
printf("RSA encrypt failed. Error: %x\n", res * -1);
return NULL;
}
err = gcry_mpi_print(GCRYMPI_FMT_USG, NULL, keysize, &templen, tmpi);
if (err) {
fprintf(stderr, "LibGCrypt error %s/%s\n",
gcry_strsource (err),
gcry_strerror (err));
gcry_mpi_release(tmpi);
free(result);
return NULL;
}
*clen = keylen;
err = gcry_mpi_print(GCRYMPI_FMT_USG, result + keysize - templen, templen, &templen, tmpi);
if (err) {
fprintf(stderr, "LibGCrypt error %s/%s\n",
gcry_strsource (err),
gcry_strerror (err));
gcry_mpi_release(tmpi);
free(result);
return NULL;
}
memset(result, 0, keysize - templen);
*clen = keysize;
gcry_mpi_release(tmpi);
return result;*/
return NULL;
return result;
}
static unsigned char *crypto_pk_polarssl_decrypt(const struct crypto_pk *_cp, const unsigned char *buf, size_t len, size_t *clen)
{
// struct crypto_pk_polarssl *ch = (struct crypto_pk_polarssl *)_ch;
/*struct crypto_pk_polarssl *cp = container_of(_cp, struct crypto_pk_libgcrypt, cp);
gcry_error_t err;
int blen = len;
@ -373,7 +338,7 @@ static unsigned char *crypto_pk_polarssl_decrypt(const struct crypto_pk *_cp, co
static size_t crypto_pk_polarssl_get_nbits(const struct crypto_pk *_cp)
{
// struct crypto_pk_polarssl *cp = container_of(_cp, struct crypto_pk_libgcrypt, cp);
// struct crypto_pk_polarssl *ch = (struct crypto_pk_polarssl *)_ch;
// return gcry_pk_get_nbits(cp->pk);
return 0;

2
common/polarssl/des.c
View file

@ -29,7 +29,7 @@
* http://csrc.nist.gov/publications/fips/fips46-3/fips46-3.pdf
*/
//#include "polarssl/config.h"
#include "polarssl_config.h"
#define POLARSSL_DES_C
#if defined(POLARSSL_DES_C)