github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-08-19 12:59:44 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

move mifare stuff to separate folder

Browse source
This commit is contained in:
merlokk 2019-03-14 15:57:11 +02:00
commit bda1a01c86
16 changed files with 1169 additions and 1168 deletions
Download patch file Download diff file Expand all files Collapse all files

6
client/Makefile
View file

@ -134,15 +134,15 @@ CMDSRCS = $(SRC_SMARTCARD) \
fido/cose.c \ fido/cose.c \
fido/cbortools.c \ fido/cbortools.c \
fido/fidocore.c \ fido/fidocore.c \
mfkey.c \ mifare/mfkey.c \
loclass/cipher.c \ loclass/cipher.c \
loclass/cipherutils.c \ loclass/cipherutils.c \
loclass/ikeys.c \ loclass/ikeys.c \
loclass/elite_crack.c\ loclass/elite_crack.c\
loclass/fileutils.c\ loclass/fileutils.c\
whereami.c\ whereami.c\
mifarehost.c\ mifare/mifarehost.c\
mifare4.c\ mifare/mifare4.c\
parity.c\ parity.c\
crc.c \ crc.c \
crc16.c \ crc16.c \

2
client/cmdhf14a.c
View file

@ -27,7 +27,7 @@
#include "cmdmain.h" #include "cmdmain.h"
#include "mifare.h" #include "mifare.h"
#include "cmdhfmfu.h" #include "cmdhfmfu.h"
#include "mifarehost.h" #include "mifare/mifarehost.h"
#include "cliparser/cliparser.h" #include "cliparser/cliparser.h"
#include "emv/apduinfo.h" #include "emv/apduinfo.h"
#include "emv/emvcore.h" #include "emv/emvcore.h"

4
client/cmdhflist.c
View file

@ -24,8 +24,8 @@
#include "parity.h" #include "parity.h"
#include "protocols.h" #include "protocols.h"
#include "crapto1/crapto1.h" #include "crapto1/crapto1.h"
#include "mifarehost.h" #include "mifare/mifarehost.h"
#include "mifaredefault.h" #include "mifare/mifaredefault.h"
#include "usb_cmd.h" #include "usb_cmd.h"
#include "pcsc.h" #include "pcsc.h"

6
client/cmdhfmf.c
View file

@ -23,13 +23,13 @@
#include "util_posix.h" #include "util_posix.h"
#include "usb_cmd.h" #include "usb_cmd.h"
#include "ui.h" #include "ui.h"
#include "mifarehost.h" #include "mifare/mifarehost.h"
#include "mifare.h" #include "mifare.h"
#include "mfkey.h" #include "mifare/mfkey.h"
#include "hardnested/hardnested_bf_core.h" #include "hardnested/hardnested_bf_core.h"
#include "cliparser/cliparser.h" #include "cliparser/cliparser.h"
#include "cmdhf14a.h" #include "cmdhf14a.h"
#include "mifare4.h" #include "mifare/mifare4.h"
#define NESTED_SECTOR_RETRY 10 // how often we try mfested() until we give up #define NESTED_SECTOR_RETRY 10 // how often we try mfested() until we give up

3
client/cmdhfmf.h
View file

@ -11,8 +11,9 @@
#ifndef CMDHFMF_H__ #ifndef CMDHFMF_H__
#define CMDHFMF_H__ #define CMDHFMF_H__
#include "mifaredefault.h" #include "mifare/mifaredefault.h"
extern int CmdHFMF(const char *Cmd);
extern int CmdHFMF(const char *Cmd); extern int CmdHFMF(const char *Cmd);
extern int CmdHF14AMfDbg(const char* cmd); extern int CmdHF14AMfDbg(const char* cmd);

2
client/cmdhfmfp.c
View file

@ -22,7 +22,7 @@
#include "ui.h" #include "ui.h"
#include "cmdhf14a.h" #include "cmdhf14a.h"
#include "mifare.h" #include "mifare.h"
#include "mifare4.h" #include "mifare/mifare4.h"
#include "cliparser/cliparser.h" #include "cliparser/cliparser.h"
#include "crypto/libpcrypto.h" #include "crypto/libpcrypto.h"

2
client/cmdhfmfp.h
View file

@ -10,7 +10,7 @@
#ifndef CMDHFMFP_H__ #ifndef CMDHFMFP_H__
#define CMDHFMFP_H__ #define CMDHFMFP_H__
#include "mifaredefault.h" #include "mifare/mifaredefault.h"
extern int CmdHFMFP(const char *Cmd); extern int CmdHFMFP(const char *Cmd);

0
client/mfkey.c → client/mifare/mfkey.c
View file

0
client/mfkey.h → client/mifare/mfkey.h
View file

0
client/mifare4.c → client/mifare/mifare4.c
View file

0
client/mifare4.h → client/mifare/mifare4.h
View file

0
client/mifaredefault.h → client/mifare/mifaredefault.h
View file

2174
client/mifarehost.c → client/mifare/mifarehost.c
View file

File diff suppressed because it is too large Load diff

136
client/mifarehost.h → client/mifare/mifarehost.h
View file

@ -1,68 +1,68 @@
// Merlok, 2011, 2017 // Merlok, 2011, 2017
// people from mifare@nethemba.com, 2010 // people from mifare@nethemba.com, 2010
// //
// This code is licensed to you under the terms of the GNU GPL, version 2 or, // This code is licensed to you under the terms of the GNU GPL, version 2 or,
// at your option, any later version. See the LICENSE.txt file for the text of // at your option, any later version. See the LICENSE.txt file for the text of
// the license. // the license.
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// High frequency ISO14443A commands // High frequency ISO14443A commands
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#ifndef MIFAREHOST_H #ifndef MIFAREHOST_H
#define MIFAREHOST_H #define MIFAREHOST_H
#include <stdint.h> #include <stdint.h>
#include <stdbool.h> #include <stdbool.h>
#include "crapto1/crapto1.h" #include "crapto1/crapto1.h"
#include "util.h" #include "util.h"
// defaults // defaults
// timeout in units. (ms * 106)/10 or us*0.0106 // timeout in units. (ms * 106)/10 or us*0.0106
// 5 == 500us // 5 == 500us
#define MF_CHKKEYS_DEFTIMEOUT 5 #define MF_CHKKEYS_DEFTIMEOUT 5
// mfCSetBlock work flags // mfCSetBlock work flags
#define CSETBLOCK_UID 0x01 #define CSETBLOCK_UID 0x01
#define CSETBLOCK_WUPC 0x02 #define CSETBLOCK_WUPC 0x02
#define CSETBLOCK_HALT 0x04 #define CSETBLOCK_HALT 0x04
#define CSETBLOCK_INIT_FIELD 0x08 #define CSETBLOCK_INIT_FIELD 0x08
#define CSETBLOCK_RESET_FIELD 0x10 #define CSETBLOCK_RESET_FIELD 0x10
#define CSETBLOCK_SINGLE_OPER 0x1F #define CSETBLOCK_SINGLE_OPER 0x1F
#define CSETBLOCK_MAGIC_1B 0x40 #define CSETBLOCK_MAGIC_1B 0x40
typedef struct { typedef struct {
uint64_t Key[2]; uint64_t Key[2];
int foundKey[2]; int foundKey[2];
} sector_t; } sector_t;
extern char logHexFileName[FILE_PATH_SIZE]; extern char logHexFileName[FILE_PATH_SIZE];
extern int mfDarkside(uint64_t *key); extern int mfDarkside(uint64_t *key);
extern int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo, uint8_t trgKeyType, uint8_t *ResultKeys, bool calibrate); extern int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo, uint8_t trgKeyType, uint8_t *ResultKeys, bool calibrate);
extern int mfCheckKeys (uint8_t blockNo, uint8_t keyType, bool clear_trace, uint8_t keycnt, uint8_t *keyBlock, uint64_t *key); extern int mfCheckKeys (uint8_t blockNo, uint8_t keyType, bool clear_trace, uint8_t keycnt, uint8_t *keyBlock, uint64_t *key);
extern int mfCheckKeysSec(uint8_t sectorCnt, uint8_t keyType, uint8_t timeout14a, bool clear_trace, uint8_t keycnt, uint8_t * keyBlock, sector_t * e_sector); extern int mfCheckKeysSec(uint8_t sectorCnt, uint8_t keyType, uint8_t timeout14a, bool clear_trace, uint8_t keycnt, uint8_t * keyBlock, sector_t * e_sector);
extern int mfEmlGetMem(uint8_t *data, int blockNum, int blocksCount); extern int mfEmlGetMem(uint8_t *data, int blockNum, int blocksCount);
extern int mfEmlSetMem(uint8_t *data, int blockNum, int blocksCount); extern int mfEmlSetMem(uint8_t *data, int blockNum, int blocksCount);
extern int mfCWipe(uint32_t numSectors, bool gen1b, bool wantWipe, bool wantFill); extern int mfCWipe(uint32_t numSectors, bool gen1b, bool wantWipe, bool wantFill);
extern int mfCSetUID(uint8_t *uid, uint8_t *atqa, uint8_t *sak, uint8_t *oldUID); extern int mfCSetUID(uint8_t *uid, uint8_t *atqa, uint8_t *sak, uint8_t *oldUID);
extern int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, bool wantWipe, uint8_t params); extern int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, bool wantWipe, uint8_t params);
extern int mfCGetBlock(uint8_t blockNo, uint8_t *data, uint8_t params); extern int mfCGetBlock(uint8_t blockNo, uint8_t *data, uint8_t params);
extern int mfTraceInit(uint8_t *tuid, uint8_t *atqa, uint8_t sak, bool wantSaveToEmlFile); extern int mfTraceInit(uint8_t *tuid, uint8_t *atqa, uint8_t sak, bool wantSaveToEmlFile);
extern int mfTraceDecode(uint8_t *data_src, int len, uint8_t parity, bool wantSaveToEmlFile); extern int mfTraceDecode(uint8_t *data_src, int len, uint8_t parity, bool wantSaveToEmlFile);
extern int isTraceCardEmpty(void); extern int isTraceCardEmpty(void);
extern int isBlockEmpty(int blockN); extern int isBlockEmpty(int blockN);
extern int isBlockTrailer(int blockN); extern int isBlockTrailer(int blockN);
extern int loadTraceCard(uint8_t *tuid); extern int loadTraceCard(uint8_t *tuid);
extern int saveTraceCard(void); extern int saveTraceCard(void);
extern int tryDecryptWord(uint32_t nt, uint32_t ar_enc, uint32_t at_enc, uint8_t *data, int len); extern int tryDecryptWord(uint32_t nt, uint32_t ar_enc, uint32_t at_enc, uint8_t *data, int len);
extern int mfCIdentify(); extern int mfCIdentify();
extern int DetectClassicPrng(void); extern int DetectClassicPrng(void);
extern bool validate_prng_nonce(uint32_t nonce); extern bool validate_prng_nonce(uint32_t nonce);
extern void mf_crypto1_decrypt(struct Crypto1State *pcs, uint8_t *data, int len, bool isEncrypted); extern void mf_crypto1_decrypt(struct Crypto1State *pcs, uint8_t *data, int len, bool isEncrypted);
#endif #endif

0
client/obj/mifare/.dummy Normal file
View file

2
client/scripting.c
View file

@ -19,7 +19,7 @@
#include "usb_cmd.h" #include "usb_cmd.h"
#include "cmdmain.h" #include "cmdmain.h"
#include "util.h" #include "util.h"
#include "mifarehost.h" #include "mifare/mifarehost.h"
#include "../common/iso15693tools.h" #include "../common/iso15693tools.h"
#include "iso14443crc.h" #include "iso14443crc.h"
#include "../common/crc16.h" #include "../common/crc16.h"