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

chg: @piwi's code cleanup and some more.

Browse Source 
ref: 43534cbad2
This commit is contained in:
iceman1001
2017-02-23 00:03:10 +01:00
parent b4762e2712
commit 9c624f67b3
31 changed files with 176 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/mfkey/mfkey32.c
View File

@@ -5,8 +5,6 @@
#include <stdlib.h>
#include <time.h>
#define llx PRIx64
#define lli PRIi64
int main (int argc, char *argv[]) {
struct Crypto1State *s,*t;
uint64_t key; // recovered key
@@ -64,7 +62,7 @@ int main (int argc, char *argv[]) {
crypto1_word(t, uid ^ nt, 0);
crypto1_word(t, nr1_enc, 1);
if (ar1_enc == (crypto1_word(t, 0, 0) ^ p64)) {
printf("\nFound Key: [%012"llx"]\n\n",key);
printf("\nFound Key: [%012" PRIx64 "]\n\n",key);
break;}
}
free(s);

6
tools/mfkey/mfkey32v2.c
View File

@@ -4,9 +4,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <time.h>
#define llx PRIx64
#define lli PRIi64
int main (int argc, char *argv[]) {
struct Crypto1State *s,*t;
uint64_t key; // recovered key
@@ -71,7 +69,7 @@ int main (int argc, char *argv[]) {
crypto1_word(t, uid ^ nt1, 0);
crypto1_word(t, nr1_enc, 1);
if (ar1_enc == (crypto1_word(t, 0, 0) ^ p64b)) {
printf("\nFound Key: [%012"llx"]\n\n",key);
printf("\nFound Key: [%012" PRIx64 "]\n\n",key);
break;}
}
free(s);

5
tools/mfkey/mfkey64.c
View File

@@ -5,9 +5,6 @@
#include <inttypes.h>
#include "crapto1.h"
#define llx PRIx64
#define lli PRIi64
int main (int argc, char *argv[]) {
struct Crypto1State *revstate;
uint64_t key; // recovered key
@@ -98,7 +95,7 @@ int main (int argc, char *argv[]) {
lfsr_rollback_word(revstate, nr_enc, 1);
lfsr_rollback_word(revstate, uid ^ nt, 0);
crypto1_get_lfsr(revstate, &key);
printf("\nFound Key: [%012"llx"]\n\n", key);
printf("\nFound Key: [%012" PRIx64 "]\n\n", key);
crypto1_destroy(revstate);
t1 = clock() - t1;