From 701914430f19222f798b03dfe148ca9d27ddcbbf Mon Sep 17 00:00:00 2001 From: Christian Molson Date: Sat, 12 Dec 2020 10:02:43 -0500 Subject: [PATCH] em4x70 makestyle --- armsrc/em4x70.c | 16 ++++++++-------- client/src/cmdlfem4x70.c | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/armsrc/em4x70.c b/armsrc/em4x70.c index fd34716a2..0bb18e7d2 100644 --- a/armsrc/em4x70.c +++ b/armsrc/em4x70.c @@ -365,31 +365,31 @@ static int authenticate(const uint8_t *rnd, const uint8_t *frnd, uint8_t *respon if (find_listen_window(true)) { em4x70_send_nibble(EM4X70_COMMAND_AUTH, true); - + // Send 56-bit Random number - for(int i=0;i<7;i++) { + for (int i = 0; i < 7; i++) { em4x70_send_byte(rnd[i]); } - + // Send 7 x 0's (Diversity bits) - for(int i=0; i<7; i++) { + for (int i = 0; i < 7; i++) { em4x70_send_bit(0); } - + // Send 28-bit f(RN) // Send first 24 bits - for(int i=0; i < 3; i++) { + for (int i = 0; i < 3; i++) { em4x70_send_byte(frnd[i]); } - + // Send last 4 bits (no parity) em4x70_send_nibble((frnd[3] >> 4) & 0xf, false); // Receive header, 20-bit g(RN), LIW uint8_t grnd[EM4X70_MAX_RECEIVE_LENGTH] = {0}; int num = em4x70_receive(grnd); - if(num < 10) { + if (num < 10) { Dbprintf("Auth failed"); return PM3_ESOFT; } diff --git a/client/src/cmdlfem4x70.c b/client/src/cmdlfem4x70.c index 877ee6d63..4172f0dc4 100644 --- a/client/src/cmdlfem4x70.c +++ b/client/src/cmdlfem4x70.c @@ -253,7 +253,7 @@ int CmdEM4x70Auth(const char *Cmd) { "Authenticate against an EM4x70 by sending random number (RN) and F(RN)\n" " If F(RN) is incorrect based on the tag crypt key, the tag will not respond", "lf em 4x70 auth -r 11223344556677 -f 11223344\n" - ); + ); void *argtable[] = { arg_param_begin, @@ -264,9 +264,9 @@ int CmdEM4x70Auth(const char *Cmd) { }; CLIExecWithReturn(ctx, Cmd, argtable, true); - + etd.parity = arg_get_lit(ctx, 1); - + int rnd_len = 7; CLIGetHexWithReturn(ctx, 2, etd.rnd, &rnd_len);