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

CHG: Moved some includes, defines, structs from .c into header file.

Browse source
This commit is contained in:
iceman1001 2016-07-31 22:00:49 +02:00
commit af4308b97b
2 changed files with 25 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

28
client/mifarehost.c
View file

@ -8,17 +8,10 @@
// mifare commands // mifare commands
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <pthread.h>
#include "mifarehost.h" #include "mifarehost.h"
#include "proxmark3.h"
//#include "radixsort.h"
#include <time.h>
// MIFARE // MIFARE
int compar_int(const void * a, const void * b) { extern int compar_int(const void * a, const void * b) {
// didn't work: (the result is truncated to 32 bits) // didn't work: (the result is truncated to 32 bits)
//return (*(uint64_t*)b - *(uint64_t*)a); //return (*(uint64_t*)b - *(uint64_t*)a);
@ -44,25 +37,6 @@ int Compare16Bits(const void * a, const void * b) {
*/ */
} }
typedef
struct {
union {
struct Crypto1State *slhead;
uint64_t *keyhead;
} head;
union {
struct Crypto1State *sltail;
uint64_t *keytail;
} tail;
uint32_t len;
uint32_t uid;
uint32_t blockNo;
uint32_t keyType;
uint32_t nt;
uint32_t ks1;
} StateList_t;
// wrapper function for multi-threaded lfsr_recovery32 // wrapper function for multi-threaded lfsr_recovery32
void* nested_worker_thread(void *arg) void* nested_worker_thread(void *arg)
{ {

28
client/mifarehost.h
View file

@ -11,17 +11,21 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <string.h>
#include <pthread.h>
#include "proxmark3.h"
//#include "radixsort.h"
#include <time.h>
#include "common.h" #include "common.h"
#include "cmdmain.h" #include "cmdmain.h"
#include "ui.h" #include "ui.h"
#include "data.h" #include "data.h"
#include "util.h" #include "util.h"
#include "nonce2key/nonce2key.h" //#include "nonce2key/nonce2key.h"
#include "nonce2key/crapto1.h" #include "nonce2key/crapto1.h"
#include "iso14443crc.h" #include "iso14443crc.h"
#include "protocols.h" #include "protocols.h"
#define MEM_CHUNK 1000000
#define NESTED_SECTOR_RETRY 10 #define NESTED_SECTOR_RETRY 10
// mifare tracer flags // mifare tracer flags
@ -32,15 +36,31 @@
#define TRACE_READ_DATA 0x04 #define TRACE_READ_DATA 0x04
#define TRACE_WRITE_OK 0x05 #define TRACE_WRITE_OK 0x05
#define TRACE_WRITE_DATA 0x06 #define TRACE_WRITE_DATA 0x06
#define TRACE_ERROR 0xFF #define TRACE_ERROR 0xFF
typedef struct {
union {
struct Crypto1State *slhead;
uint64_t *keyhead;
} head;
union {
struct Crypto1State *sltail;
uint64_t *keytail;
} tail;
uint32_t len;
uint32_t uid;
uint32_t blockNo;
uint32_t keyType;
uint32_t nt;
uint32_t ks1;
} StateList_t;
typedef struct { typedef struct {
uint64_t Key[2]; uint64_t Key[2];
int foundKey[2]; int foundKey[2];
} sector; } sector;
int compar_int(const void * a, const void * b); extern int compar_int(const void * a, const void * b);
extern char logHexFileName[FILE_PATH_SIZE]; extern char logHexFileName[FILE_PATH_SIZE];
int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo, uint8_t trgKeyType, uint8_t * ResultKeys, bool calibrate); int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo, uint8_t trgKeyType, uint8_t * ResultKeys, bool calibrate);