github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-08-20 05:13:22 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixes 2 bugs in mifare simulate (#380)

Browse source 
- Check button press when there is NOFIELD, so we can exit also without FIELD
- struct nonces_t is moved to include/mifare.h so client and arm has the same definition
This commit is contained in:
etmatrix 2017-08-17 16:59:48 +02:00 • committed by pwpiwi
commit 4efdfbe638
4 changed files with 18 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

1
client/mfkey.c
View file

@ -10,6 +10,7 @@
// MIFARE Darkside hack
//-----------------------------------------------------------------------------
#include "mifare.h"
#include "mfkey.h"
#include "crapto1/crapto1.h"

13
client/mfkey.h
View file

@ -16,19 +16,6 @@
#include <stdint.h>
#include <stdbool.h>
typedef struct {
uint32_t cuid;
uint8_t sector;
uint8_t keytype;
uint32_t nonce;
uint32_t ar;
uint32_t nr;
uint32_t at;
uint32_t nonce2;
uint32_t ar2;
uint32_t nr2;
} nonces_t;
extern bool mfkey32(nonces_t data, uint64_t *outputkey);
extern bool mfkey32_moebius(nonces_t data, uint64_t *outputkey);
extern int mfkey64(nonces_t data, uint64_t *outputkey);