From bf5d7992ce29e9fb006a5b6770bd3457b9b0f18b Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Thu, 26 Jan 2017 14:21:51 +0100 Subject: [PATCH] ADD: @micolous random nonce, adjusted to fit in. Icemanfork only uses Moebius attack, so no need for an extra parameter in client. ref: https://github.com/Proxmark/proxmark3/pull/209 --- appveyor.yml | 9 +++---- armsrc/Makefile | 3 ++- armsrc/iso14443a.c | 60 ++++++++++++++++++++++++++++++---------------- armsrc/iso14443a.h | 1 + common/random.c | 19 +++++++++++++++ common/random.h | 21 ++++++++++++++++ include/mifare.h | 4 ++-- include/usb_cmd.h | 1 + 8 files changed, 90 insertions(+), 28 deletions(-) create mode 100644 common/random.c create mode 100644 common/random.h diff --git a/appveyor.yml b/appveyor.yml index 248bbe4c..cac45bd4 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,14 +1,15 @@ os: Windows Server 2012 -platform: x64 +platform: mingw +qt: mingw492_32 branches: only: - master install: - - cinst make - - cinst mingw - + - set QTDIR=C:\Qt\5.5\mingw492_32 + - set PATH=%PATH%;%QTDIR%\bin;C:\MinGW\bin + before_build: - make clean diff --git a/armsrc/Makefile b/armsrc/Makefile index 40923a8b..08252565 100644 --- a/armsrc/Makefile +++ b/armsrc/Makefile @@ -54,7 +54,8 @@ THUMBSRC = start.c \ string.c \ BigBuf.c \ ticks.c \ - hfsnoop.c + hfsnoop.c \ + random.c # These are to be compiled in ARM mode ARMSRC = fpgaloader.c \ diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c index 81e45960..d0695501 100644 --- a/armsrc/iso14443a.c +++ b/armsrc/iso14443a.c @@ -849,6 +849,8 @@ bool prepare_allocated_tag_modulation(tag_response_info_t* response_info) { //----------------------------------------------------------------------------- void SimulateIso14443aTag(int tagType, int flags, byte_t* data) { + #define ATTACK_KEY_COUNT 8 // keep same as define in cmdhfmf.c -> readerAttack() + uint8_t sak = 0; uint32_t cuid = 0; uint32_t nonce = 0; @@ -866,7 +868,7 @@ void SimulateIso14443aTag(int tagType, int flags, byte_t* data) { uint8_t cardAUTHSC = 0; uint8_t cardAUTHKEY = 0xff; // no authentication // allow collecting up to 8 sets of nonces to allow recovery of up to 8 keys - #define ATTACK_KEY_COUNT 8 // keep same as define in cmdhfmf.c -> readerAttack() + nonces_t ar_nr_resp[ATTACK_KEY_COUNT*2]; // for 2 separate attack types (nml, moebius) memset(ar_nr_resp, 0x00, sizeof(ar_nr_resp)); @@ -972,16 +974,17 @@ void SimulateIso14443aTag(int tagType, int flags, byte_t* data) { response3a[0] = sak & 0xFB; ComputeCrc14443(CRC_14443_A, response3a, 1, &response3a[1], &response3a[2]); - uint8_t response5[] = { 0x01, 0x01, 0x01, 0x01 }; // Very random tag nonce + // Tag NONCE. + uint8_t response5[4]; + nonce = prand(); + num_to_bytes(nonce, 4, response5); + uint8_t response6[] = { 0x04, 0x58, 0x80, 0x02, 0x00, 0x00 }; // dummy ATS (pseudo-ATR), answer to RATS: // Format byte = 0x58: FSCI=0x08 (FSC=256), TA(1) and TC(1) present, // TA(1) = 0x80: different divisors not supported, DR = 1, DS = 1 // TB(1) = not present. Defaults: FWI = 4 (FWT = 256 * 16 * 2^4 * 1/fc = 4833us), SFGI = 0 (SFG = 256 * 16 * 2^0 * 1/fc = 302us) // TC(1) = 0x02: CID supported, NAD not supported ComputeCrc14443(CRC_14443_A, response6, 4, &response6[4], &response6[5]); - - // the randon nonce - nonce = bytes_to_num(response5, 4); // Prepare GET_VERSION (different for UL EV-1 / NTAG) // uint8_t response7_EV1[] = {0x00, 0x04, 0x03, 0x01, 0x01, 0x00, 0x0b, 0x03, 0xfd, 0xf7}; //EV1 48bytes VERSION. @@ -1058,7 +1061,7 @@ void SimulateIso14443aTag(int tagType, int flags, byte_t* data) { } // incease nonce at every command recieved - nonce++; + nonce = prand(); num_to_bytes(nonce, 4, response5); p_response = NULL; @@ -1173,8 +1176,16 @@ void SimulateIso14443aTag(int tagType, int flags, byte_t* data) { // Collect AR/NR per keytype & sector if ( (flags & FLAG_NR_AR_ATTACK) == FLAG_NR_AR_ATTACK ) { + for (uint8_t i = 0; i < ATTACK_KEY_COUNT; i++) { - if ( ar_nr_collected[i+mM]==0 || ((cardAUTHSC == ar_nr_resp[i+mM].sector) && (cardAUTHKEY == ar_nr_resp[i+mM].keytype) && (ar_nr_collected[i+mM] > 0)) ) { + + if ( ar_nr_collected[i+mM] == 0 || ( + (cardAUTHSC == ar_nr_resp[i+mM].sector) && + (cardAUTHKEY == ar_nr_resp[i+mM].keytype) && + (ar_nr_collected[i+mM] > 0) + ) + ) { + // if first auth for sector, or matches sector and keytype of previous auth if (ar_nr_collected[i+mM] < 2) { // if we haven't already collected 2 nonces for this sector @@ -1360,7 +1371,7 @@ void SimulateIso14443aTag(int tagType, int flags, byte_t* data) { BigBuf_free_keep_EM(); LED_A_OFF(); - if(flags & FLAG_NR_AR_ATTACK && MF_DBGLEVEL >= 1) { + if(flags & FLAG_NR_AR_ATTACK && MF_DBGLEVEL >= 1) { for ( uint8_t i = 0; i < ATTACK_KEY_COUNT; i++) { if (ar_nr_collected[i] == 2) { Dbprintf("Collected two pairs of AR/NR which can be used to extract %s from reader for sector %d:", (i 0)) ) { + + if ( ar_nr_collected[i+mM] == 0 || ( + (cardAUTHSC == ar_nr_resp[i+mM].sector) && + (cardAUTHKEY == ar_nr_resp[i+mM].keytype) && + (ar_nr_collected[i+mM] > 0) + ) + ) { // if first auth for sector, or matches sector and keytype of previous auth if (ar_nr_collected[i+mM] < 2) { @@ -2788,7 +2806,7 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t * // if we've collected all the nonces we need - finish. if (nonce1_count == moebius_n_count) { - cmd_send(CMD_ACK,CMD_SIMULATE_MIFARE_CARD,0,0,&ar_nr_resp,sizeof(ar_nr_resp)); + cmd_send(CMD_ACK, CMD_SIMULATE_MIFARE_CARD, 0, 0, &ar_nr_resp, sizeof(ar_nr_resp)); nonce1_count = 0; nonce2_count = 0; moebius_n_count = 0; @@ -3058,13 +3076,13 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t * // Interactive mode flag, means we need to send ACK /* - if((flags & FLAG_INTERACTIVE) == FLAG_INTERACTIVE) { + if((flags & FLAG_INTERACTIVE) == FLAG_INTERACTIVE && flags & FLAG_NR_AR_ATTACK == FLAG_NR_AR_ATTACK) { // May just aswell send the collected ar_nr in the response aswell uint8_t len = ar_nr_collected * 4 * 4; cmd_send(CMD_ACK, CMD_SIMULATE_MIFARE_CARD, len, 0, &ar_nr_responses, len); } + */ - */ if( ((flags & FLAG_NR_AR_ATTACK) == FLAG_NR_AR_ATTACK ) && MF_DBGLEVEL >= 1 ) { for ( uint8_t i = 0; i < ATTACK_KEY_COUNT; i++) { if (ar_nr_collected[i] == 2) { @@ -3093,10 +3111,10 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t * ); } } - } - + } - if (MF_DBGLEVEL >= 1) Dbprintf("Emulator stopped. Tracing: %d trace length: %d ", tracing, BigBuf_get_traceLen()); + if (MF_DBGLEVEL >= 1) + Dbprintf("Emulator stopped. Tracing: %d trace length: %d ", tracing, BigBuf_get_traceLen()); FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF); LEDsoff(); diff --git a/armsrc/iso14443a.h b/armsrc/iso14443a.h index 2128f6ec..82d3aa97 100644 --- a/armsrc/iso14443a.h +++ b/armsrc/iso14443a.h @@ -26,6 +26,7 @@ extern "C" { #include "crapto1.h" #include "mifareutil.h" #include "parity.h" +#include "random.h" typedef struct { enum { diff --git a/common/random.c b/common/random.c new file mode 100644 index 00000000..62d0cbeb --- /dev/null +++ b/common/random.c @@ -0,0 +1,19 @@ +#include "random.h" + +static uint64_t next_random = 1; + +/* Generates a (non-cryptographically secure) 32-bit random number. + * + * We don't have an implementation of the "rand" function. Instead we use a + * method of seeding with the time it took to call "autoseed" from first run. + * + * https://github.com/Proxmark/proxmark3/pull/209/commits/f9c1dcd9f6e68a8c07cffed697a9c4c8caed6015 + */ +uint32_t prand() { + if (next_random == 1) + next_random = GetTickCount(); + + next_random = next_random * 6364136223846793005 + 1; + return (uint32_t)(next_random >> 32) % 0xffffffff; +} + diff --git a/common/random.h b/common/random.h new file mode 100644 index 00000000..45f176d3 --- /dev/null +++ b/common/random.h @@ -0,0 +1,21 @@ +//----------------------------------------------------------------------------- +// Micolous Jan 2017 +// Iceman Jan 2017 +// This code is licensed to you under the terms of the GNU GPL, version 2 or, +// at your option, any later version. See the LICENSE.txt file for the text of +// the license. +//----------------------------------------------------------------------------- +// pseudo rng generator. To be used when PM3 simulates Mifare tag. +// i.e. 'hf mf sim' +// 'hf 14a sim' +//----------------------------------------------------------------------------- + +#ifndef __RANDOM_H +#define __RANDOM_H + +#include "common.h" +#include "ticks.h" + +uint32_t prand(); + +#endif \ No newline at end of file diff --git a/include/mifare.h b/include/mifare.h index bd78dda6..11c977d5 100644 --- a/include/mifare.h +++ b/include/mifare.h @@ -66,14 +66,14 @@ typedef enum ISO14B_COMMAND { //----------------------------------------------------------------------------- typedef struct { uint32_t cuid; - uint8_t sector; - uint8_t keytype; uint32_t nonce; uint32_t ar; uint32_t nr; uint32_t nonce2; uint32_t ar2; uint32_t nr2; + uint8_t sector; + uint8_t keytype; } nonces_t; #endif // _MIFARE_H_ diff --git a/include/usb_cmd.h b/include/usb_cmd.h index 0cb6ed93..53ac18e7 100644 --- a/include/usb_cmd.h +++ b/include/usb_cmd.h @@ -239,6 +239,7 @@ typedef struct{ #define FLAG_10B_UID_IN_DATA 0x08 #define FLAG_UID_IN_EMUL 0x10 #define FLAG_NR_AR_ATTACK 0x20 +//#define FLAG_RANDOM_NONCE 0x40 //Iclass reader flags #define FLAG_ICLASS_READER_ONLY_ONCE 0x01 -- 2.39.2