dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CHG: renamed struct sector -> sector_t

Browse Source 
CHG: defines on armside
CHG: #define WIN32 ->  _WIN32
CHG: started to enhance "hf mf chkkeys"
REM: removed some duplicates etc in default keys.
This commit is contained in:
iceman1001
2017-03-06 19:11:08 +01:00
parent 318bae20de
commit 57778a4630
12 changed files with 64 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
armsrc/appmain.c
View File

@@ -9,6 +9,7 @@
// The main application code. This is the first thing called after start.c
// executes.
//-----------------------------------------------------------------------------
#include <stdarg.h>
#include "usb_cdc.h"
#include "proxmark3.h"
#include "apps.h"

1
armsrc/apps.h
View File

@@ -29,7 +29,6 @@ extern "C" {
#include "pcf7931.h"
#include "desfire.h"
#include "iso14443b.h"
//#include "iso14443a.h"
#include "emvcard.h"
extern int rsamples; // = 0;

22
armsrc/mifarecmd.c
View File

@@ -956,9 +956,13 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
//
//-----------------------------------------------------------------------------
void MifareChkKeys(uint16_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain) {
uint8_t blockNo = arg0 & 0xff;
uint8_t keyType = (arg0 >> 8) & 0xff;
bool clearTrace = arg1;
#define STD_SEARCH 1
#define EXT_SEARCH 2
uint8_t blockNo = arg0 & 0xFF;
uint8_t keyType = (arg0 >> 8) & 0xFF;
uint8_t searchType = (arg1 >> 8 ) & 0xFF;
bool clearTrace = arg1 & 0xFF;
uint8_t keyCount = arg2;
uint64_t ui64Key = 0;
@@ -1026,8 +1030,16 @@ void MifareChkKeys(uint16_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain) {
continue;
}
isOK = 1;
break;
// found a key.
//
//if ( searchType == EXT_SEARCH) {
//}
//else {
isOK = 1;
break;
//}
}
LED_B_ON();

3
armsrc/optimized_cipher.h
View File

@@ -2,8 +2,7 @@
#define OPTIMIZED_CIPHER_H
#include <stdint.h>
#include <stdlib.h>
#include <string.h>
#include <stddef.h>
#include <stdbool.h>
/**