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

FIX: more minor issues with block Numbers.

Browse source 
KNOWN BUG: Right now, it kind of defaults to Block 0 when a getparam8 failes. (like  writing "hf mfu rdbl k",  ie a letter instead of number). This bug is the same all over the pm3 source-code.
This commit is contained in:
iceman1001 2015-01-07 19:01:00 +01:00
commit c0e6c18bf5
1 changed files with 15 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

26
client/cmdhfmfu.c
View file

@ -13,8 +13,9 @@
#include "cmdhf14a.h" #include "cmdhf14a.h"
uint8_t MAX_ULTRA_BLOCKS = 0x0f; #define MAX_ULTRA_BLOCKS 0x0f
uint8_t MAX_ULTRAC_BLOCKS = 0x2c; #define MAX_ULTRAC_BLOCKS 0x2f
//#define MAX_ULTRAC_BLOCKS 0x2c
uint8_t key1_blnk_data[16] = { 0x00 }; uint8_t key1_blnk_data[16] = { 0x00 };
uint8_t key2_defa_data[16] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f }; uint8_t key2_defa_data[16] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f };
uint8_t key3_3des_data[16] = { 0x49,0x45,0x4D,0x4B,0x41,0x45,0x52,0x42,0x21,0x4E,0x41,0x43,0x55,0x4F,0x59,0x46 }; uint8_t key3_3des_data[16] = { 0x49,0x45,0x4D,0x4B,0x41,0x45,0x52,0x42,0x21,0x4E,0x41,0x43,0x55,0x4F,0x59,0x46 };
@ -88,7 +89,7 @@ int CmdHF14AMfUInfo(const char *Cmd){
// Mifare Ultralight Write Single Block // Mifare Ultralight Write Single Block
// //
int CmdHF14AMfUWrBl(const char *Cmd){ int CmdHF14AMfUWrBl(const char *Cmd){
uint8_t blockNo = 0; uint8_t blockNo = -1;
bool chinese_card = FALSE; bool chinese_card = FALSE;
uint8_t bldata[16] = {0x00}; uint8_t bldata[16] = {0x00};
UsbCommand resp; UsbCommand resp;
@ -106,6 +107,7 @@ int CmdHF14AMfUWrBl(const char *Cmd){
} }
blockNo = param_get8(Cmd, 0); blockNo = param_get8(Cmd, 0);
if (blockNo > MAX_ULTRA_BLOCKS){ if (blockNo > MAX_ULTRA_BLOCKS){
PrintAndLog("Error: Maximum number of blocks is 15 for Ultralight Cards!"); PrintAndLog("Error: Maximum number of blocks is 15 for Ultralight Cards!");
return 1; return 1;
@ -157,7 +159,7 @@ int CmdHF14AMfUWrBl(const char *Cmd){
// //
int CmdHF14AMfURdBl(const char *Cmd){ int CmdHF14AMfURdBl(const char *Cmd){
uint8_t blockNo = 0; uint8_t blockNo = -1;
char cmdp = param_getchar(Cmd, 0); char cmdp = param_getchar(Cmd, 0);
@ -168,10 +170,12 @@ int CmdHF14AMfURdBl(const char *Cmd){
} }
blockNo = param_get8(Cmd, 0); blockNo = param_get8(Cmd, 0);
// if (blockNo>MAX_ULTRA_BLOCKS){
// PrintAndLog("Error: Maximum number of blocks is 15 for Ultralight Cards!"); if (blockNo > MAX_ULTRA_BLOCKS){
// return 1; PrintAndLog("Error: Maximum number of blocks is 15 for Ultralight Cards!");
// } return 1;
}
PrintAndLog("--block no:0x%02X (%d)", (int)blockNo, blockNo); PrintAndLog("--block no:0x%02X (%d)", (int)blockNo, blockNo);
UsbCommand c = {CMD_MIFAREU_READBL, {blockNo}}; UsbCommand c = {CMD_MIFAREU_READBL, {blockNo}};
SendCommand(&c); SendCommand(&c);
@ -521,7 +525,7 @@ int CmdHF14AMfUCRdBl(const char *Cmd)
return 1; return 1;
} }
if (blockNo > (MAX_ULTRAC_BLOCKS+4) ){ if (blockNo > MAX_ULTRAC_BLOCKS ){
PrintAndLog("Error: Maximum number of readable blocks is 47 for Ultralight-C Cards!"); PrintAndLog("Error: Maximum number of readable blocks is 47 for Ultralight-C Cards!");
return 1; return 1;
} }
@ -551,7 +555,7 @@ int CmdHF14AMfUCRdBl(const char *Cmd)
// //
int CmdHF14AMfUCWrBl(const char *Cmd){ int CmdHF14AMfUCWrBl(const char *Cmd){
uint8_t blockNo = 0; uint8_t blockNo = -1;
bool chinese_card = FALSE; bool chinese_card = FALSE;
uint8_t bldata[16] = {0x00}; uint8_t bldata[16] = {0x00};
UsbCommand resp; UsbCommand resp;
@ -570,7 +574,7 @@ int CmdHF14AMfUCWrBl(const char *Cmd){
} }
blockNo = param_get8(Cmd, 0); blockNo = param_get8(Cmd, 0);
if (blockNo > (MAX_ULTRAC_BLOCKS+4) ){ if (blockNo > MAX_ULTRAC_BLOCKS ){
PrintAndLog("Error: Maximum number of blocks is 47 for Ultralight-C Cards!"); PrintAndLog("Error: Maximum number of blocks is 47 for Ultralight-C Cards!");
return 1; return 1;
} }