projects
/
proxmark3-svn
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
@Marshmellow42 's cleanup isn device-side "hf mfu" code. Looks nice. Dump uses...
[proxmark3-svn]
/
client
/
cmdhfmfdes.c
diff --git
a/client/cmdhfmfdes.c
b/client/cmdhfmfdes.c
index 75aaa084685a7ced8ea410a6c69d57d86dcc642c..f72cfecdb14571fd9de668f6202635477d7e8f15 100644
(file)
--- a/
client/cmdhfmfdes.c
+++ b/
client/cmdhfmfdes.c
@@
-12,7
+12,8
@@
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
-#include <openssl/des.h>
+//#include <openssl/des.h>
+#include "loclass/des.h"
#include "cmdmain.h"
#include "proxmark3.h"
#include "../include/common.h"
#include "cmdmain.h"
#include "proxmark3.h"
#include "../include/common.h"
@@
-23,6
+24,8
@@
#include "cmdparser.h"
#include "util.h"
#include "cmdhfmfdes.h"
#include "cmdparser.h"
#include "util.h"
#include "cmdhfmfdes.h"
+#include "cmdhf14a.h"
+
uint8_t CMDPOS = 0;
uint8_t LENPOS = 1;
uint8_t CMDPOS = 0;
uint8_t LENPOS = 1;
@@
-157,7
+160,7
@@
int CmdHF14ADesInfo(const char *Cmd){
PrintAndLog(" Production date : week %02x, 20%02x",resp.d.asBytes[33], resp.d.asBytes[34]);
PrintAndLog(" -----------------------------------------------------------");
PrintAndLog(" Hardware Information");
PrintAndLog(" Production date : week %02x, 20%02x",resp.d.asBytes[33], resp.d.asBytes[34]);
PrintAndLog(" -----------------------------------------------------------");
PrintAndLog(" Hardware Information");
- PrintAndLog(" Vendor Id : %s",
GetVendorStr
(resp.d.asBytes[7]));
+ PrintAndLog(" Vendor Id : %s",
getTagInfo
(resp.d.asBytes[7]));
PrintAndLog(" Type : 0x%02X",resp.d.asBytes[8]);
PrintAndLog(" Subtype : 0x%02X",resp.d.asBytes[9]);
PrintAndLog(" Version : %d.%d",resp.d.asBytes[10], resp.d.asBytes[11]);
PrintAndLog(" Type : 0x%02X",resp.d.asBytes[8]);
PrintAndLog(" Subtype : 0x%02X",resp.d.asBytes[9]);
PrintAndLog(" Version : %d.%d",resp.d.asBytes[10], resp.d.asBytes[11]);
@@
-165,7
+168,7
@@
int CmdHF14ADesInfo(const char *Cmd){
PrintAndLog(" Protocol : %s",GetProtocolStr(resp.d.asBytes[13]));
PrintAndLog(" -----------------------------------------------------------");
PrintAndLog(" Software Information");
PrintAndLog(" Protocol : %s",GetProtocolStr(resp.d.asBytes[13]));
PrintAndLog(" -----------------------------------------------------------");
PrintAndLog(" Software Information");
- PrintAndLog(" Vendor Id : %s",
GetVendorStr
(resp.d.asBytes[14]));
+ PrintAndLog(" Vendor Id : %s",
getTagInfo
(resp.d.asBytes[14]));
PrintAndLog(" Type : 0x%02X",resp.d.asBytes[15]);
PrintAndLog(" Subtype : 0x%02X",resp.d.asBytes[16]);
PrintAndLog(" Version : %d.%d",resp.d.asBytes[17], resp.d.asBytes[18]);
PrintAndLog(" Type : 0x%02X",resp.d.asBytes[15]);
PrintAndLog(" Subtype : 0x%02X",resp.d.asBytes[16]);
PrintAndLog(" Version : %d.%d",resp.d.asBytes[17], resp.d.asBytes[18]);
@@
-210,17
+213,6
@@
int CmdHF14ADesInfo(const char *Cmd){
return 1;
}
return 1;
}
-char * GetVendorStr( uint8_t id){
- static char buf[30];
- char *retStr = buf;
-
- if ( id == 0x04 )
- sprintf(retStr, "0x%02X (NXP)",id);
- else
- sprintf(retStr,"0x%02X (Unknown)",id);
- return buf;
-}
-
/*
The 7 MSBits (= n) code the storage size itself based on 2^n,
the LSBit is set to '0' if the size is exactly 2^n
/*
The 7 MSBits (= n) code the storage size itself based on 2^n,
the LSBit is set to '0' if the size is exactly 2^n
@@
-236,7
+228,7
@@
char * GetCardSizeStr( uint8_t fsize ){
uint16_t lsize = 1 << (fsize >>1);
// is LSB set?
uint16_t lsize = 1 << (fsize >>1);
// is LSB set?
- if ( fsize &
(1 << 0 )
)
+ if ( fsize &
1
)
sprintf(retStr, "0x%02X (%d - %d bytes)",fsize, usize, lsize);
else
sprintf(retStr, "0x%02X (%d bytes)", fsize, lsize);
sprintf(retStr, "0x%02X (%d - %d bytes)",fsize, usize, lsize);
else
sprintf(retStr, "0x%02X (%d bytes)", fsize, lsize);
@@
-251,7
+243,7
@@
char * GetProtocolStr(uint8_t id){
if ( id == 0x05)
sprintf(retStr,"0x%02X (ISO 14443-3, 14443-4)", id);
else
if ( id == 0x05)
sprintf(retStr,"0x%02X (ISO 14443-3, 14443-4)", id);
else
- sprintf(retStr,"0x%02X
", id);
+ sprintf(retStr,"0x%02X
(Unknown)", id);
return buf;
}
return buf;
}
Impressum
,
Datenschutz