X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/e17660d5f7dfa44447068e7897ee6454157d2ae1..refs/pull/568/head:/client/mifarehost.c?ds=inline
diff --git a/client/mifarehost.c b/client/mifarehost.c
index fe1a8edb..2bd21077 100644
--- a/client/mifarehost.c
+++ b/client/mifarehost.c
@@ -178,12 +178,14 @@ int mfDarkside(uint64_t *key)
continue;
}
- qsort(keylist, keycount, sizeof(*keylist), compare_uint64);
- keycount = intersection(last_keylist, keylist);
- if (keycount == 0) {
- free(last_keylist);
- last_keylist = keylist;
- continue;
+ if (par_list == 0) {
+ qsort(keylist, keycount, sizeof(*keylist), compare_uint64);
+ keycount = intersection(last_keylist, keylist);
+ if (keycount == 0) {
+ free(last_keylist);
+ last_keylist = keylist;
+ continue;
+ }
}
if (keycount > 1) {
@@ -198,10 +200,10 @@ int mfDarkside(uint64_t *key)
for (int i = 0; i < keycount; i += max_keys) {
int size = keycount - i > max_keys ? max_keys : keycount - i;
for (int j = 0; j < size; j++) {
- if (last_keylist == NULL) {
- num_to_bytes(keylist[i*max_keys + j], 6, keyBlock);
+ if (par_list == 0) {
+ num_to_bytes(last_keylist[i*max_keys + j], 6, keyBlock+(j*6));
} else {
- num_to_bytes(last_keylist[i*max_keys + j], 6, keyBlock);
+ num_to_bytes(keylist[i*max_keys + j], 6, keyBlock+(j*6));
}
}
if (!mfCheckKeys(0, 0, false, size, keyBlock, key)) {
@@ -295,7 +297,13 @@ typedef
// wrapper function for multi-threaded lfsr_recovery32
-void* nested_worker_thread(void *arg)
+void
+#ifdef __has_attribute
+#if __has_attribute(force_align_arg_pointer)
+__attribute__((force_align_arg_pointer))
+#endif
+#endif
+*nested_worker_thread(void *arg)
{
struct Crypto1State *p1;
StateList_t *statelist = arg;
@@ -309,6 +317,7 @@ void* nested_worker_thread(void *arg)
return statelist->head.slhead;
}
+
int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo, uint8_t trgKeyType, uint8_t *resultKey, bool calibrate)
{
uint16_t i;
@@ -609,7 +618,8 @@ int saveTraceCard(void) {
for (int i = 0; i < 64; i++) { // blocks
for (int j = 0; j < 16; j++) // bytes
fprintf(f, "%02x", *(traceCard + i * 16 + j));
- fprintf(f,"\n");
+ if (i < 63)
+ fprintf(f,"\n");
}
fclose(f);
return 0;
@@ -826,20 +836,30 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {
if (len ==4) {
traceState = TRACE_IDLE;
- at_enc = bytes_to_num(data, 4);
-
- // decode key here)
- ks2 = ar_enc ^ prng_successor(nt, 64);
- ks3 = at_enc ^ prng_successor(nt, 96);
- revstate = lfsr_recovery64(ks2, ks3);
- lfsr_rollback_word(revstate, 0, 0);
- lfsr_rollback_word(revstate, 0, 0);
- lfsr_rollback_word(revstate, nr_enc, 1);
- lfsr_rollback_word(revstate, uid ^ nt, 0);
+ if (!traceCrypto1) {
+ at_enc = bytes_to_num(data, 4);
+
+ // decode key here)
+ ks2 = ar_enc ^ prng_successor(nt, 64);
+ ks3 = at_enc ^ prng_successor(nt, 96);
+ revstate = lfsr_recovery64(ks2, ks3);
+ lfsr_rollback_word(revstate, 0, 0);
+ lfsr_rollback_word(revstate, 0, 0);
+ lfsr_rollback_word(revstate, nr_enc, 1);
+ lfsr_rollback_word(revstate, uid ^ nt, 0);
+
+ crypto1_get_lfsr(revstate, &lfsr);
+ printf("key> %x%x\n", (unsigned int)((lfsr & 0xFFFFFFFF00000000) >> 32), (unsigned int)(lfsr & 0xFFFFFFFF));
+ AddLogUint64(logHexFileName, "key> ", lfsr);
+ } else {
+ printf("key> nested not implemented!\n");
+ at_enc = bytes_to_num(data, 4);
+
+ crypto1_destroy(traceCrypto1);
- crypto1_get_lfsr(revstate, &lfsr);
- printf("key> %x%x\n", (unsigned int)((lfsr & 0xFFFFFFFF00000000) >> 32), (unsigned int)(lfsr & 0xFFFFFFFF));
- AddLogUint64(logHexFileName, "key> ", lfsr);
+ // not implemented
+ traceState = TRACE_ERROR;
+ }
int blockShift = ((traceCurBlock & 0xFC) + 3) * 16;
if (isBlockEmpty((traceCurBlock & 0xFC) + 3)) memcpy(traceCard + blockShift + 6, trailerAccessBytes, 4);
@@ -857,15 +877,6 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {
// set cryptosystem state
traceCrypto1 = lfsr_recovery64(ks2, ks3);
-
-// nt = crypto1_word(traceCrypto1, nt ^ uid, 1) ^ nt;
-
- /* traceCrypto1 = crypto1_create(lfsr); // key in lfsr
- crypto1_word(traceCrypto1, nt ^ uid, 0);
- crypto1_word(traceCrypto1, ar, 1);
- crypto1_word(traceCrypto1, 0, 0);
- crypto1_word(traceCrypto1, 0, 0);*/
-
return 0;
} else {
traceState = TRACE_ERROR;
@@ -903,3 +914,72 @@ int tryDecryptWord(uint32_t nt, uint32_t ar_enc, uint32_t at_enc, uint8_t *data,
return 0;
}
+/** validate_prng_nonce
+ * Determine if nonce is deterministic. ie: Suspectable to Darkside attack.
+ * returns
+ * true = weak prng
+ * false = hardend prng
+ */
+bool validate_prng_nonce(uint32_t nonce) {
+ uint16_t *dist = 0;
+ uint16_t x, i;
+
+ dist = malloc(2 << 16);
+ if(!dist)
+ return -1;
+
+ // init prng table:
+ for (x = i = 1; i; ++i) {
+ dist[(x & 0xff) << 8 | x >> 8] = i;
+ x = x >> 1 | (x ^ x >> 2 ^ x >> 3 ^ x >> 5) << 15;
+ }
+
+ uint32_t res = (65535 - dist[nonce >> 16] + dist[nonce & 0xffff]) % 65535;
+
+ free(dist);
+ return (res == 16);
+}
+
+/* Detect Tag Prng,
+* function performs a partial AUTH, where it tries to authenticate against block0, key A, but only collects tag nonce.
+* the tag nonce is check to see if it has a predictable PRNG.
+* @returns
+* TRUE if tag uses WEAK prng (ie Now the NACK bug also needs to be present for Darkside attack)
+* FALSE is tag uses HARDEND prng (ie hardnested attack possible, with known key)
+*/
+int DetectClassicPrng(void){
+
+ UsbCommand resp, respA;
+ uint8_t cmd[] = {0x60, 0x00}; // MIFARE_AUTH_KEYA
+ uint32_t flags = ISO14A_CONNECT | ISO14A_RAW | ISO14A_APPEND_CRC | ISO14A_NO_RATS;
+
+ UsbCommand c = {CMD_READER_ISO_14443a, {flags, sizeof(cmd), 0}};
+ memcpy(c.d.asBytes, cmd, sizeof(cmd));
+
+ clearCommandBuffer();
+ SendCommand(&c);
+ if (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
+ PrintAndLog("PRNG UID: Reply timeout.");
+ return -1;
+ }
+
+ // if select tag failed.
+ if (resp.arg[0] == 0) {
+ PrintAndLog("PRNG error: selecting tag failed, can't detect prng.");
+ return -1;
+ }
+
+ if (!WaitForResponseTimeout(CMD_ACK, &respA, 5000)) {
+ PrintAndLog("PRNG data: Reply timeout.");
+ return -1;
+ }
+
+ // check respA
+ if (respA.arg[0] != 4) {
+ PrintAndLog("PRNG data error: Wrong length: %d", respA.arg[0]);
+ return -1;
+ }
+
+ uint32_t nonce = bytes_to_num(respA.d.asBytes, respA.arg[0]);
+ return validate_prng_nonce(nonce);
+}