github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-07-16 02:03:00 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Iclass decrypt error, shouldn't have decrypted block 6 according to Heart of darkness-paper

Browse source
This commit is contained in:
Martin Holst Swende 2015-02-17 23:17:43 +01:00
parent 41524d8a39
commit 9a9bcea82b
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
client/cmdhficlass.c
View file

@ -451,11 +451,12 @@ int usage_hf_iclass_decrypt()
{ {
PrintAndLog("Usage: hf iclass decrypt f <tagdump> o "); PrintAndLog("Usage: hf iclass decrypt f <tagdump> o ");
PrintAndLog(""); PrintAndLog("");
PrintAndLog("In order to use this function, the file 'iclass_decryptionkey.bin must reside"); PrintAndLog("OBS! In order to use this function, the file 'iclass_decryptionkey.bin' must reside");
PrintAndLog("in the working directory. The file should be 16 bytes binary data"); PrintAndLog("in the working directory. The file should be 16 bytes binary data");
PrintAndLog("");
PrintAndLog("example: hf iclass decrypt tagdump_12312342343.bin"); PrintAndLog("example: hf iclass decrypt tagdump_12312342343.bin");
PrintAndLog(""); PrintAndLog("");
PrintAndLog("OBS! This is pretty stupid implementation, it tries to decrypt every block after block 5. "); PrintAndLog("OBS! This is pretty stupid implementation, it tries to decrypt every block after block 6. ");
PrintAndLog("Correct behaviour would be to decrypt only the application areas where the key is valid,"); PrintAndLog("Correct behaviour would be to decrypt only the application areas where the key is valid,");
PrintAndLog("which is defined by the configuration block."); PrintAndLog("which is defined by the configuration block.");
return 1; return 1;
@ -527,7 +528,7 @@ int CmdHFiClassDecrypt(const char *Cmd)
size_t blocknum =0; size_t blocknum =0;
while(bytes_read == 8) while(bytes_read == 8)
{ {
if(blocknum < 6) if(blocknum < 7)
{ {
memcpy(decrypted+(blocknum*8), enc_dump, 8); memcpy(decrypted+(blocknum*8), enc_dump, 8);
}else{ }else{