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

FIX: standalone mode HF_COLIN - it now compiles.

Browse source
This commit is contained in:
iceman1001 2018-02-25 08:15:38 +01:00
commit 23ecd4154a
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
armsrc/Standalone/hf_colin.c
View file

@ -178,7 +178,7 @@ void RunMod() {
break; break;
} else { } else {
/* BRACE YOURSELF : AS LONG AS WE TRAP A KNOWN KEY, WE STOP CHECKING AND ENFORCE KNOWN SCHEMES */ /* BRACE YOURSELF : AS LONG AS WE TRAP A KNOWN KEY, WE STOP CHECKING AND ENFORCE KNOWN SCHEMES */
uint8_t tosendkey[12]; char tosendkey[12];
num_to_bytes(key64, 6, foundKey[type][sec]); num_to_bytes(key64, 6, foundKey[type][sec]);
Dbprintf("SEC: %d ; KEY : %012" PRIx64 " ; TYP: %i", sec, key64, type); Dbprintf("SEC: %d ; KEY : %012" PRIx64 " ; TYP: %i", sec, key64, type);
/*cmd_send(CMD_CJB_INFORM_CLIENT_KEY, 12, sec, type, tosendkey, 12);*/ /*cmd_send(CMD_CJB_INFORM_CLIENT_KEY, 12, sec, type, tosendkey, 12);*/
@ -550,8 +550,8 @@ int cjat91_saMifareChkKeys(uint8_t blockNo, uint8_t keyType, bool clearTrace, ui
MF_DBGLEVEL = MF_DBG_NONE; MF_DBGLEVEL = MF_DBG_NONE;
iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN); iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
set_tracing(false); set_tracing(false);
uint8_t uid[10]; // uint8_t uid[10];
uint32_t cuid; // uint32_t cuid;
struct Crypto1State mpcs = {0, 0}; struct Crypto1State mpcs = {0, 0};
struct Crypto1State *pcs; struct Crypto1State *pcs;
pcs = &mpcs; pcs = &mpcs;
@ -652,9 +652,9 @@ int saMifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *data
// variables // variables
byte_t isOK = 0; byte_t isOK = 0;
uint8_t uid[10] = {0x00}; // uint8_t uid[10] = {0x00};
uint8_t d_block[18] = {0x00}; uint8_t d_block[18] = {0x00};
uint32_t cuid; // uint32_t cuid;
uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE]; uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];
uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE]; uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];

2
armsrc/Standalone/hf_colin.h
View file

@ -13,7 +13,7 @@
#define __HF_COLIN_H #define __HF_COLIN_H
#include "iso14443a.h" #include "iso14443a.h"
//#include "printf.h" #include "printf.h"
#include "protocols.h" #include "protocols.h"
#include "standalone.h" // standalone definitions #include "standalone.h" // standalone definitions
#include <stdbool.h> // for bool #include <stdbool.h> // for bool