X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/75465377b93c9a27450a186342e9cfd2a84b4173..a07a448220f85c4e27a9b50f412d376474ea4f69:/armsrc/apps.h

diff --git a/armsrc/apps.h b/armsrc/apps.h
index 90313aec..0db2a19d 100644
--- a/armsrc/apps.h
+++ b/armsrc/apps.h
@@ -14,27 +14,21 @@
 
 #include <stdint.h>
 #include <stddef.h>
-#include <sys/types.h>
-
 #include <stdlib.h>
+#include <sys/types.h>
 #include <string.h>
 #include <strings.h>
 
-
 #include "../include/common.h"
 #include "../include/hitag2.h"
 #include "../include/mifare.h"
 
 //#include <openssl/des.h>
 //#include <openssl/aes.h>
-
 //#include "des.h"
 //#include "aes.h"
 #include "../common/desfire.h"
 #include "../common/crc32.h"
-//#include "desfire_crypto.h"
-//#include "desfire_key.h"
-
 
 // The large multi-purpose buffer, typically used to hold A/D samples,
 // maybe processed in some way.
@@ -78,7 +72,10 @@ void ToSendReset(void);
 void ListenReaderField(int limit);
 void AcquireRawAdcSamples125k(int at134khz);
 void SnoopLFRawAdcSamples(int divisor, int trigger_threshold);
-void DoAcquisition125k(int trigger_threshold);
+void DoAcquisition125k_internal(int trigger_threshold, bool silent);
+void DoAcquisition125k_threshold(int trigger_threshold);
+void DoAcquisition125k();
+
 extern int ToSendMax;
 extern uint8_t ToSend[];
 extern uint32_t BigBuf[];
@@ -156,6 +153,7 @@ void CopyIndala224toT55x7(int uid1, int uid2, int uid3, int uid4, int uid5, int
 void T55xxWriteBlock(uint32_t Data, uint32_t Block, uint32_t Pwd, uint8_t PwdMode);
 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);
@@ -209,30 +207,17 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
 void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain);
 
 // mifaredesfire.h
-bool 		InitDesfireCard();
-void		MifareSendCommand(uint8_t arg0,uint8_t arg1, uint8_t *datain);
-void 		MifareDesfireGetInformation();
-void 		MifareDES_Auth1(uint8_t arg0,uint8_t arg1,uint8_t arg2, uint8_t *datain);
-void 		MifareDES_Auth2(uint32_t arg0, uint8_t *datain);
-int 		mifare_des_auth2(uint32_t uid, uint8_t *key, uint8_t *blockData);
-void 		ReaderMifareDES(uint32_t param, uint32_t param2, uint8_t * datain);
-int 		DesfireAPDU(uint8_t *cmd, size_t cmd_len, uint8_t *dataout);
-size_t		CreateAPDU( uint8_t *datain, size_t len, uint8_t *dataout);
-void 		OnSuccess();
-void 		OnError();
+bool 	InitDesfireCard();
+void	MifareSendCommand(uint8_t arg0,uint8_t arg1, uint8_t *datain);
+void 	MifareDesfireGetInformation();
+void 	MifareDES_Auth1(uint8_t arg0,uint8_t arg1,uint8_t arg2, uint8_t *datain);
+void 	ReaderMifareDES(uint32_t param, uint32_t param2, uint8_t * datain);
+int 	DesfireAPDU(uint8_t *cmd, size_t cmd_len, uint8_t *dataout);
+size_t	CreateAPDU( uint8_t *datain, size_t len, uint8_t *dataout);
+void 	OnSuccess();
+void 	OnError();
+
 
-// desfire_key.h
-desfirekey_t 		Desfire_des_key_new (const uint8_t value[8]);
-desfirekey_t 		Desfire_3des_key_new (const uint8_t value[16]);
-desfirekey_t 		Desfire_des_key_new_with_version (const uint8_t value[8]);
-desfirekey_t 		Desfire_3des_key_new_with_version (const uint8_t value[16]);
-desfirekey_t 		Desfire_3k3des_key_new (const uint8_t value[24]);
-desfirekey_t 		Desfire_3k3des_key_new_with_version (const uint8_t value[24]);
-desfirekey_t 		Desfire_aes_key_new (const uint8_t value[16]);
-desfirekey_t 		Desfire_aes_key_new_with_version (const uint8_t value[16], uint8_t version);
-uint8_t          	Desfire_key_get_version (desfirekey_t key);
-void             	Desfire_key_set_version (desfirekey_t key, uint8_t version);
-desfirekey_t 		Desfire_session_key_new (const uint8_t rnda[], const uint8_t rndb[], desfirekey_t authkey);
 
 // desfire_crypto.h
 void	*mifare_cryto_preprocess_data (desfiretag_t tag, void *data, size_t *nbytes, off_t offset, int communication_settings);
@@ -247,13 +232,11 @@ 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);
 void ReaderIso15693(uint32_t parameter);	// Simulate an ISO15693 reader - greg
-void SimTagIso15693(uint32_t parameter);	// simulate an ISO15693 tag - greg
+void SimTagIso15693(uint32_t parameter, uint8_t *uid);	// simulate an ISO15693 tag - greg
 void BruteforceIso15693Afi(uint32_t speed); // find an AFI of a tag - atrox
 void DirectTag15693Command(uint32_t datalen,uint32_t speed, uint32_t recv, uint8_t data[]); // send arbitrary commands from CLI - atrox 
 void SetDebugIso15693(uint32_t flag);