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

pointers

Browse source
This commit is contained in:
iceman1001 2019-04-08 12:29:49 +02:00
commit cfe793bd22
1 changed files with 13 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

28
client/emv/emv_pk.c
View file

@ -43,7 +43,7 @@
static ssize_t emv_pk_read_bin(char *buf, unsigned char *bin, size_t size, size_t *read) { static ssize_t emv_pk_read_bin(char *buf, unsigned char *bin, size_t size, size_t *read) {
size_t left = size; size_t left = size;
char *p = buf; char *p = buf;
while (*p && *p == ' ') while (*p != 0 && *p == ' ')
p++; p++;
while (left > 0) { while (left > 0) {
@ -70,7 +70,7 @@ static ssize_t emv_pk_read_bin(char *buf, unsigned char *bin, size_t size, size_
return -(p - buf); return -(p - buf);
} }
while (*p && *p == ' ') while (*p != 0 && *p == ' ')
p++; p++;
p--; p--;
@ -85,7 +85,7 @@ static ssize_t emv_pk_read_ymv(char *buf, unsigned *ymv) {
*ymv = 0; *ymv = 0;
while (*p && *p == ' ') while (*p != 0 && *p == ' ')
p++; p++;
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
@ -101,7 +101,7 @@ static ssize_t emv_pk_read_ymv(char *buf, unsigned *ymv) {
temp[i] = (c1 * 16 + c2); temp[i] = (c1 * 16 + c2);
} }
while (*p && *p == ' ') while (*p != 0 && *p == ' ')
p++; p++;
p--; p--;
@ -116,7 +116,7 @@ static ssize_t emv_pk_read_ymv(char *buf, unsigned *ymv) {
static ssize_t emv_pk_read_string(char *buf, char *str, size_t size) { static ssize_t emv_pk_read_string(char *buf, char *str, size_t size) {
char *p = buf; char *p = buf;
while (*p && *p == ' ') while (*p != 0 && *p == ' ')
p++; p++;
while (size > 1) { while (size > 1) {
@ -132,7 +132,7 @@ static ssize_t emv_pk_read_string(char *buf, char *str, size_t size) {
*str = 0; *str = 0;
while (*p && *p == ' ') while (*p != 0 && *p == ' ')
p++; p++;
p--; p--;
@ -471,15 +471,14 @@ struct emv_pk *emv_pk_get_ca_pk(const unsigned char *rid, unsigned char idx) {
} }
} }
*/ */
if (!pk) { const char *relfname = "emv/capk.txt";
const char *relfname = "emv/capk.txt";
char fname[strlen(get_my_executable_directory()) + strlen(relfname) + 1]; char fname[strlen(get_my_executable_directory()) + strlen(relfname) + 1];
strcpy(fname, get_my_executable_directory()); strcpy(fname, get_my_executable_directory());
strcat(fname, relfname); strcat(fname, relfname);
pk = emv_pk_get_ca_pk_from_file(fname, rid, idx);
pk = emv_pk_get_ca_pk_from_file(fname, rid, idx);
}
if (!pk) if (!pk)
return NULL; return NULL;
@ -491,14 +490,13 @@ struct emv_pk *emv_pk_get_ca_pk(const unsigned char *rid, unsigned char idx) {
pk->rid[4], pk->rid[4],
pk->index, pk->index,
pk->mlen * 8); pk->mlen * 8);
if (emv_pk_verify(pk)) { if (emv_pk_verify(pk)) {
printf("OK\n"); printf("OK\n");
return pk; return pk;
} }
printf("Failed!\n"); printf("Failed!\n");
emv_pk_free(pk); emv_pk_free(pk);
return NULL; return NULL;
} }