mirror of
https://github.com/Proxmark/proxmark3.git
synced 2025-08-22 14:13:42 -07:00
removed code from library
This commit is contained in:
parent
951a27e35e
commit
c11b129c23
4 changed files with 28 additions and 16 deletions
|
@ -485,10 +485,10 @@ int CmdHF14AInfo(const char *Cmd)
|
||||||
if (isMifareClassic) {
|
if (isMifareClassic) {
|
||||||
switch(DetectClassicPrng()) {
|
switch(DetectClassicPrng()) {
|
||||||
case 0:
|
case 0:
|
||||||
PrintAndLog("Prng detection: WEAK");
|
PrintAndLog("Prng detection: HARDEND (hardnested)");
|
||||||
break;
|
break;
|
||||||
case 1:
|
case 1:
|
||||||
PrintAndLog("Prng detection: HARDEND (hardnested)");
|
PrintAndLog("Prng detection: WEAK");
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
PrintAndLog("Prng detection error.");
|
PrintAndLog("Prng detection error.");
|
||||||
|
|
|
@ -903,6 +903,32 @@ int tryDecryptWord(uint32_t nt, uint32_t ar_enc, uint32_t at_enc, uint8_t *data,
|
||||||
return 0;
|
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,
|
/* Detect Tag Prng,
|
||||||
* function performs a partial AUTH, where it tries to authenticate against block0, key A, but only collects tag nonce.
|
* 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.
|
* the tag nonce is check to see if it has a predictable PRNG.
|
||||||
|
|
|
@ -426,18 +426,6 @@ int nonce_distance(uint32_t from, uint32_t to)
|
||||||
return (65535 + dist[to >> 16] - dist[from >> 16]) % 65535;
|
return (65535 + dist[to >> 16] - dist[from >> 16]) % 65535;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** 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) {
|
|
||||||
// init prng table:
|
|
||||||
nonce_distance(nonce, nonce);
|
|
||||||
return ((65535 - dist[nonce >> 16] + dist[nonce & 0xffff]) % 65535) == 16;
|
|
||||||
}
|
|
||||||
|
|
||||||
static uint32_t fastfwd[2][8] = {
|
static uint32_t fastfwd[2][8] = {
|
||||||
{ 0, 0x4BC53, 0xECB1, 0x450E2, 0x25E29, 0x6E27A, 0x2B298, 0x60ECB},
|
{ 0, 0x4BC53, 0xECB1, 0x450E2, 0x25E29, 0x6E27A, 0x2B298, 0x60ECB},
|
||||||
{ 0, 0x1D962, 0x4BC53, 0x56531, 0xECB1, 0x135D3, 0x450E2, 0x58980}};
|
{ 0, 0x1D962, 0x4BC53, 0x56531, 0xECB1, 0x135D3, 0x450E2, 0x58980}};
|
||||||
|
|
|
@ -20,7 +20,6 @@
|
||||||
#ifndef CRAPTO1_INCLUDED
|
#ifndef CRAPTO1_INCLUDED
|
||||||
#define CRAPTO1_INCLUDED
|
#define CRAPTO1_INCLUDED
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include <stdbool.h>
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#endif
|
#endif
|
||||||
|
@ -49,7 +48,6 @@ uint8_t lfsr_rollback_bit(struct Crypto1State* s, uint32_t in, int fb);
|
||||||
uint8_t lfsr_rollback_byte(struct Crypto1State* s, uint32_t in, int fb);
|
uint8_t lfsr_rollback_byte(struct Crypto1State* s, uint32_t in, int fb);
|
||||||
uint32_t lfsr_rollback_word(struct Crypto1State* s, uint32_t in, int fb);
|
uint32_t lfsr_rollback_word(struct Crypto1State* s, uint32_t in, int fb);
|
||||||
int nonce_distance(uint32_t from, uint32_t to);
|
int nonce_distance(uint32_t from, uint32_t to);
|
||||||
extern bool validate_prng_nonce(uint32_t nonce);
|
|
||||||
#define FOREACH_VALID_NONCE(N, FILTER, FSIZE)\
|
#define FOREACH_VALID_NONCE(N, FILTER, FSIZE)\
|
||||||
uint32_t __n = 0,__M = 0, N = 0;\
|
uint32_t __n = 0,__M = 0, N = 0;\
|
||||||
int __i;\
|
int __i;\
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue