FIX: tnp3sim, now can insert keys if the dumpfile is blank. Like the ,,,lander dumps...

[proxmark3-svn] / armsrc / apps.h

diff --git a/armsrc/apps.h b/armsrc/apps.h
index a2812428b400f0f00ccfefa4a6f74efd52152cf7..f15ffd14b1c75923a15d045c695eb1321db34392 100644 (file)
--- a/armsrc/apps.h
+++ b/armsrc/apps.h
@@ -15,15 +15,16 @@
 #include <stdint.h>
 #include <stddef.h>
 #include <stdlib.h>
 #include <stdint.h>
 #include <stddef.h>
 #include <stdlib.h>

-#include <sys/types.h>
-#include <string.h>
-#include <strings.h>
-#include "../common/crc32.h"
-#include "../common/lfdemod.h"
+#include <sys/types.h> 
+#include "common.h"
+#include "crc32.h"
+#include "lfdemod.h"

 #include "BigBuf.h"
 #include "fpgaloader.h"
 #include "BigBuf.h"
 #include "fpgaloader.h"

+#include "usb_cdc.h"

 #include "hitag2.h"
 #include "mifare.h"
 #include "hitag2.h"
 #include "mifare.h"

+#include "pcf7931.h"

 //#include "des.h"
 //#include "aes.h"
 #include "desfire.h"
 //#include "des.h"
 //#include "aes.h"
 #include "desfire.h"


@@ -90,12 +91,10 @@ void T55xxWriteBlock(uint32_t Data, uint32_t Block, uint32_t Pwd, uint8_t PwdMod
 void T55xxReadBlock(uint32_t Block, uint32_t Pwd, uint8_t PwdMode );
 void T55xxReadTrace(void);
 void TurnReadLFOn();
 void T55xxReadBlock(uint32_t Block, uint32_t Pwd, uint8_t PwdMode );
 void T55xxReadTrace(void);
 void TurnReadLFOn();

-int DemodPCF7931(uint8_t **outBlocks);
-int IsBlock0PCF7931(uint8_t *Block);
-int IsBlock1PCF7931(uint8_t *Block);
-void ReadPCF7931();

 void EM4xReadWord(uint8_t Address, uint32_t Pwd, uint8_t PwdMode);
 void EM4xWriteWord(uint32_t Data, uint8_t Address, uint32_t Pwd, uint8_t PwdMode);
 void EM4xReadWord(uint8_t Address, uint32_t Pwd, uint8_t PwdMode);
 void EM4xWriteWord(uint32_t Data, uint8_t Address, uint32_t Pwd, uint8_t PwdMode);

+void CopyViKingtoT55x7(uint32_t block1,uint32_t block2);
+

 
 /// iso14443.h
 void SimulateIso14443bTag(void);
 
 /// iso14443.h
 void SimulateIso14443bTag(void);


@@ -106,7 +105,7 @@ void SendRawCommand14443B(uint32_t, uint32_t, uint8_t, uint8_t[]);
 
 /// iso14443a.h
 void RAMFUNC SniffIso14443a(uint8_t param);
 
 /// iso14443a.h
 void RAMFUNC SniffIso14443a(uint8_t param);

-void SimulateIso14443aTag(int tagType, int uid_1st, int uid_2nd, byte_t* data);
+void SimulateIso14443aTag(int tagType, int flags, byte_t* data);

 void ReaderIso14443a(UsbCommand * c);
 // Also used in iclass.c
 bool RAMFUNC LogTrace(const uint8_t *btBytes, uint16_t len, uint32_t timestamp_start, uint32_t timestamp_end, uint8_t *parity, bool readerToTag);
 void ReaderIso14443a(UsbCommand * c);
 // Also used in iclass.c
 bool RAMFUNC LogTrace(const uint8_t *btBytes, uint16_t len, uint32_t timestamp_start, uint32_t timestamp_end, uint8_t *parity, bool readerToTag);


@@ -161,7 +160,6 @@ void        OnSuccess();
 void   OnError(uint8_t reason);
 
 
 void   OnError(uint8_t reason);
 
 

-

 // desfire_crypto.h
 void   *mifare_cryto_preprocess_data (desfiretag_t tag, void *data, size_t *nbytes, off_t offset, int communication_settings);
 void    *mifare_cryto_postprocess_data (desfiretag_t tag, void *data, ssize_t *nbytes, int communication_settings);
 // desfire_crypto.h
 void   *mifare_cryto_preprocess_data (desfiretag_t tag, void *data, size_t *nbytes, off_t offset, int communication_settings);
 void    *mifare_cryto_postprocess_data (desfiretag_t tag, void *data, ssize_t *nbytes, int communication_settings);


@@ -174,7 +172,6 @@ size_t  enciphered_data_length (const desfiretag_t tag, const size_t nbytes, int
 void    cmac_generate_subkeys (desfirekey_t key);
 void    cmac (const desfirekey_t  key, uint8_t *ivect, const uint8_t *data, size_t len, uint8_t *cmac);
 
 void    cmac_generate_subkeys (desfirekey_t key);
 void    cmac (const desfirekey_t  key, uint8_t *ivect, const uint8_t *data, size_t len, uint8_t *cmac);
 

-

 /// iso15693.h
 void RecordRawAdcSamplesIso15693(void);
 void AcquireRawAdcSamplesIso15693(void);
 /// iso15693.h
 void RecordRawAdcSamplesIso15693(void);
 void AcquireRawAdcSamplesIso15693(void);


@@ -190,6 +187,14 @@ void SimulateIClass(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain
 void ReaderIClass(uint8_t arg0);
 void ReaderIClass_Replay(uint8_t arg0,uint8_t *MAC);
 void IClass_iso14443A_GetPublic(uint8_t arg0);
 void ReaderIClass(uint8_t arg0);
 void ReaderIClass_Replay(uint8_t arg0,uint8_t *MAC);
 void IClass_iso14443A_GetPublic(uint8_t arg0);

+void iClass_Authentication(uint8_t *MAC);
+void iClass_WriteBlock(uint8_t blockNo, uint8_t *data);
+void iClass_ReadBlk(uint8_t blockNo);
+bool iClass_ReadBlock(uint8_t blockNo, uint8_t *readdata);
+void iClass_Dump(uint8_t blockno, uint8_t numblks);
+void iClass_Clone(uint8_t startblock, uint8_t endblock, uint8_t *data);
+void iClass_ReadCheck(uint8_t  blockNo, uint8_t keyType);
+

 
 // hitag2.h
 void SnoopHitag(uint32_t type);
 
 // hitag2.h
 void SnoopHitag(uint32_t type);