github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-21 13:53:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

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
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;

13
tools/nonce2key/nonce2key.c
View file

@ -1,7 +1,6 @@
#include "crapto1.h"
#define __STDC_FORMAT_MACROS
#include <inttypes.h>
#define llx PRIx64
#include <stdio.h>
#include <time.h>
typedef unsigned char byte_t;
@ -19,15 +18,15 @@ int main(const int argc, const char* argv[]) {
printf("\nsyntax: %s <uid> <nt> <par> <ks>\n\n",argv[0]);
return 1;
}
sscanf(argv[1],"%08x",&uid);
sscanf(argv[2],"%08x",&nt);
sscanf(argv[3],"%016"llx,&par_info);
sscanf(argv[4],"%016"llx,&ks_info);
sscanf(argv[1],"%08x", &uid);
sscanf(argv[2],"%08x", &nt);
sscanf(argv[3],"%016" SCNx64 ,&par_info);
sscanf(argv[4],"%016" SCNx64 ,&ks_info);
// Reset the last three significant bits of the reader nonce
nr &= 0xffffff1f;
printf("\nuid(%08x) nt(%08x) par(%016"llx") ks(%016"llx")\n\n",uid,nt,par_info,ks_info);
printf("\nuid(%08x) nt(%08x) par(%016" PRIx64 ") ks(%016" PRIx64 ")\n\n", uid, nt, par_info, ks_info);
for ( pos = 0; pos < 8; pos++ ) {
ks3x[7-pos] = (ks_info >> (pos*8)) & 0x0f;
@ -56,7 +55,7 @@ int main(const int argc, const char* argv[]) {
state = lfsr_common_prefix(nr,rr,ks3x,par);
lfsr_rollback_word(state,uid^nt,0);
crypto1_get_lfsr(state,&key_recovered);
printf("\nkey recovered: %012"llx"\n\n",key_recovered);
printf("\nkey recovered: %012" PRIx64 "\n\n", key_recovered);
crypto1_destroy(state);
t1 = clock() - t1;