github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-20 05:13:46 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

style

Browse source
This commit is contained in:
iceman1001 2024-09-14 15:03:29 +02:00
commit 20a0bc3a81
12 changed files with 56 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

15
client/src/emv/emv_pk.c
View file

@ -448,9 +448,12 @@ static struct emv_pk *emv_pk_get_ca_pk_from_file(const char *fname,
return NULL; return NULL;
} }
// not used
/*
char *emv_pk_get_ca_pk_file(const char *dirname, const unsigned char *rid, unsigned char idx) { char *emv_pk_get_ca_pk_file(const char *dirname, const unsigned char *rid, unsigned char idx) {
if (!dirname) if (dirname == NULL) {
dirname = ".";//openemv_config_get_str("capk.dir", NULL); dirname = ".";//openemv_config_get_str("capk.dir", NULL);
}
char *filename; char *filename;
int ret = asprintf(&filename, "%s/%02hhx%02hhx%02hhx%02hhx%02hhx_%02hhx.0", int ret = asprintf(&filename, "%s/%02hhx%02hhx%02hhx%02hhx%02hhx_%02hhx.0",
@ -462,15 +465,17 @@ char *emv_pk_get_ca_pk_file(const char *dirname, const unsigned char *rid, unsig
rid[4], rid[4],
idx); idx);
if (ret <= 0) if (ret <= 0) {
return NULL; return NULL;
}
return filename; return filename;
} }
char *emv_pk_get_ca_pk_rid_file(const char *dirname, const unsigned char *rid) { char *emv_pk_get_ca_pk_rid_file(const char *dirname, const unsigned char *rid) {
if (!dirname) if (dirname == NULL) {
dirname = "."; //openemv_config_get_str("capk.dir", NULL); dirname = "."; //openemv_config_get_str("capk.dir", NULL);
}
char *filename; char *filename;
int ret = asprintf(&filename, "%s/%02hhx%02hhx%02hhx%02hhx%02hhx.pks", int ret = asprintf(&filename, "%s/%02hhx%02hhx%02hhx%02hhx%02hhx.pks",
@ -481,11 +486,13 @@ char *emv_pk_get_ca_pk_rid_file(const char *dirname, const unsigned char *rid) {
rid[3], rid[3],
rid[4]); rid[4]);
if (ret <= 0) if (ret <= 0) {
return NULL; return NULL;
}
return filename; return filename;
} }
*/
struct emv_pk *emv_pk_get_ca_pk(const unsigned char *rid, unsigned char idx) { struct emv_pk *emv_pk_get_ca_pk(const unsigned char *rid, unsigned char idx) {
struct emv_pk *pk = NULL; struct emv_pk *pk = NULL;

5
client/src/emv/emv_pk.h
View file

@ -22,6 +22,7 @@
#define EMV_PK_H #define EMV_PK_H
#include "common.h" #include "common.h"
#include <stdbool.h>
struct emv_pk { struct emv_pk {
unsigned char rid[5]; unsigned char rid[5];
@ -46,7 +47,7 @@ void emv_pk_free(struct emv_pk *pk);
char *emv_pk_dump_pk(const struct emv_pk *pk); char *emv_pk_dump_pk(const struct emv_pk *pk);
bool emv_pk_verify(const struct emv_pk *pk); bool emv_pk_verify(const struct emv_pk *pk);
char *emv_pk_get_ca_pk_file(const char *dirname, const unsigned char *rid, unsigned char idx); // char *emv_pk_get_ca_pk_file(const char *dirname, const unsigned char *rid, unsigned char idx);
char *emv_pk_get_ca_pk_rid_file(const char *dirname, const unsigned char *rid); // char *emv_pk_get_ca_pk_rid_file(const char *dirname, const unsigned char *rid);
struct emv_pk *emv_pk_get_ca_pk(const unsigned char *rid, unsigned char idx); struct emv_pk *emv_pk_get_ca_pk(const unsigned char *rid, unsigned char idx);
#endif #endif

2
client/src/mifare/mifarehost.c
View file

@ -52,7 +52,7 @@ int mfDarkside(uint8_t blockno, uint8_t key_type, uint64_t *key) {
bool first_run = true; bool first_run = true;
// message // message
PrintAndLogEx(INFO, "Expected execution time is about 25seconds on average"); PrintAndLogEx(INFO, "Expected execution time is about " _YELLOW_("25") " seconds on average");
PrintAndLogEx(INFO, "Press " _GREEN_("pm3 button") " to abort"); PrintAndLogEx(INFO, "Press " _GREEN_("pm3 button") " to abort");
while (true) { while (true) {