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

chg: must have a default return value

Browse Source
This commit is contained in:
iceman1001
2020-05-20 18:30:41 +02:00
parent 30be05ec3f
commit 35886fab91
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
armsrc/mifarecmd.c
View File

@@ -1940,7 +1940,7 @@ int MifareECardLoad(uint8_t sectorcnt, uint8_t keytype) {
clear_trace(); clear_trace();
set_tracing(true); set_tracing(true);
int retval; int retval = PM3_SUCCESS;
if (!iso14443a_select_card(uid, NULL, &cuid, true, 0, true)) { if (!iso14443a_select_card(uid, NULL, &cuid, true, 0, true)) {
retval = PM3_ESOFT; retval = PM3_ESOFT;
@@ -1952,8 +1952,9 @@ int MifareECardLoad(uint8_t sectorcnt, uint8_t keytype) {
uint64_t ui64Key = emlGetKey(sectorNo, keytype); uint64_t ui64Key = emlGetKey(sectorNo, keytype);
if (sectorNo == 0) { if (sectorNo == 0) {
if (mifare_classic_auth(pcs, cuid, FirstBlockOfSector(sectorNo), keytype, ui64Key, AUTH_FIRST)) { if (mifare_classic_auth(pcs, cuid, FirstBlockOfSector(sectorNo), keytype, ui64Key, AUTH_FIRST)) {
retval = PM3_ESOFT;
if (DBGLEVEL > DBG_ERROR) Dbprintf("Sector[%2d]. Auth error", sectorNo); if (DBGLEVEL > DBG_ERROR) Dbprintf("Sector[%2d]. Auth error", sectorNo);
break; goto out;
} }
} else { } else {
if (mifare_classic_auth(pcs, cuid, FirstBlockOfSector(sectorNo), keytype, ui64Key, AUTH_NESTED)) { if (mifare_classic_auth(pcs, cuid, FirstBlockOfSector(sectorNo), keytype, ui64Key, AUTH_NESTED)) {
@@ -1979,10 +1980,8 @@ int MifareECardLoad(uint8_t sectorcnt, uint8_t keytype) {
} }
} }
if (mifare_classic_halt(pcs, cuid)) { int res = mifare_classic_halt(pcs, cuid);
if (DBGLEVEL > DBG_ERROR) (void)res;
Dbprintf("Halt error");
}
if (DBGLEVEL >= DBG_INFO) DbpString("Emulator fill sectors finished"); if (DBGLEVEL >= DBG_INFO) DbpString("Emulator fill sectors finished");