dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor coverity fixes

Browse Source
This commit is contained in:
iceman1001
2020-04-13 14:47:36 +02:00
parent ba926addfb
commit abfcb524b5
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
client/cmdhfmfdes.c
View File

@@ -648,6 +648,7 @@ int get_desfire_auth(mfdes_authinput_t *payload, mfdes_auth_res_t *rpayload) {
// Part 1 // Part 1
// iceman: I guess you want to determine if the key was set. Maybe check keylen instead? 0 = not set.
if (payload->key[0] == '\0') { if (payload->key[0] == '\0') {
if (payload->algo == MFDES_AUTH_DES) { if (payload->algo == MFDES_AUTH_DES) {
memcpy(keybytes, PICC_MASTER_KEY8, 8); memcpy(keybytes, PICC_MASTER_KEY8, 8);
@@ -1299,8 +1300,7 @@ typedef struct mfdes_file {
} PACKED mfdes_file_t; } PACKED mfdes_file_t;
static int get_desfire_create_std_file(mfdes_file_t *file) { static int get_desfire_create_std_file(mfdes_file_t *file) {
if (file->access_rights[0] == '\0') return PM3_EINVARG; if (file == NULL) return PM3_EINVARG;
if (file->filesize[0] == '\0') return PM3_EINVARG;
sAPDU apdu = {0x90, MFDES_CREATE_STD_DATA_FILE, 0x00, 0x00, 1 + 2 + 1 + 2 + 3, (uint8_t *)file}; // 0xCD sAPDU apdu = {0x90, MFDES_CREATE_STD_DATA_FILE, 0x00, 0x00, 1 + 2 + 1 + 2 + 3, (uint8_t *)file}; // 0xCD
@@ -1609,12 +1609,12 @@ static int CmdHF14ADesCreateStdFile(const char *Cmd) {
arg_param_end arg_param_end
}; };
CLIExecWithReturn(Cmd, argtable, false); CLIExecWithReturn(Cmd, argtable, false);
uint8_t fileno; uint8_t fileno[] = {0};
int aidlength = 0; int aidlength = 0;
uint8_t aid[3] = {0}; uint8_t aid[3] = {0};
CLIGetHexWithReturn(1, aid, &aidlength); CLIGetHexWithReturn(1, aid, &aidlength);
int filenolen = 0; int filenolen = 0;
CLIGetHexWithReturn(2, &fileno, &filenolen); CLIGetHexWithReturn(2, fileno, &filenolen);
int fidlength = 0; int fidlength = 0;
uint8_t fid[2] = {0}; uint8_t fid[2] = {0};
CLIParamHexToBuf(arg_get_str(3), fid, 2, &fidlength); CLIParamHexToBuf(arg_get_str(3), fid, 2, &fidlength);
@@ -1666,7 +1666,7 @@ static int CmdHF14ADesCreateStdFile(const char *Cmd) {
mfdes_file_t ft; mfdes_file_t ft;
memcpy(ft.fid, fid, 2); memcpy(ft.fid, fid, 2);
memcpy(ft.filesize, filesize, 3); memcpy(ft.filesize, filesize, 3);
ft.fileno = fileno; ft.fileno = fileno[0];
ft.comset = comset; ft.comset = comset;
memcpy(ft.access_rights, ar, 2); memcpy(ft.access_rights, ar, 2);