X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/b403c300910c62cbacf95be213efdc6ed8ed85d1..be67483e63430608982f1c92e02b59d7b4dc65b3:/client/cmdanalyse.c diff --git a/client/cmdanalyse.c b/client/cmdanalyse.c index fb084f43..a8deb67f 100644 --- a/client/cmdanalyse.c +++ b/client/cmdanalyse.c @@ -26,14 +26,14 @@ int usage_analyse_lcr(void) { PrintAndLog("expected output: Target (BA) requires final LRC XOR byte value: 5A"); return 0; } - int usage_analyse_checksum(void) { PrintAndLog("The bytes will be added with eachother and than limited with the applied mask"); PrintAndLog("Finally compute ones' complement of the least significant bytes"); PrintAndLog(""); - PrintAndLog("Usage: analyse chksum [h] b m "); + PrintAndLog("Usage: analyse chksum [h] [v] b m "); PrintAndLog("Options:"); PrintAndLog(" h This help"); + PrintAndLog(" v supress header"); PrintAndLog(" b bytes to calc missing XOR in a LCR"); PrintAndLog(" m bit mask to limit the outpuyt"); PrintAndLog(""); @@ -42,7 +42,6 @@ int usage_analyse_checksum(void) { PrintAndLog("expected output: 0x61"); return 0; } - int usage_analyse_crc(void){ PrintAndLog("A stub method to test different crc implementations inside the PM3 sourcecode. Just because you figured out the poly, doesn't mean you get the desired output"); PrintAndLog(""); @@ -55,6 +54,20 @@ int usage_analyse_crc(void){ PrintAndLog(" analyse crc 137AF00A0A0D"); return 0; } +int usage_analyse_hid(void){ + PrintAndLog("Permute function from 'heart of darkness' paper."); + PrintAndLog(""); + PrintAndLog("Usage: analyse hid [h] "); + PrintAndLog("Options:"); + PrintAndLog(" h This help"); + PrintAndLog(" r reverse permuted key"); + PrintAndLog(" f permute key"); + PrintAndLog(" input bytes"); + PrintAndLog(""); + PrintAndLog("Samples:"); + PrintAndLog(" analyse hid r 0123456789abcdef"); + return 0; +} static uint8_t calculateLRC( uint8_t* bytes, uint8_t len) { uint8_t LRC = 0; @@ -63,7 +76,7 @@ static uint8_t calculateLRC( uint8_t* bytes, uint8_t len) { return LRC; } -static uint8_t calcSumCrumbAdd( uint8_t* bytes, uint8_t len, uint32_t mask) { +static uint16_t calcSumCrumbAdd( uint8_t* bytes, uint8_t len, uint32_t mask) { uint8_t sum = 0; for (uint8_t i = 0; i < len; i++) { sum += CRUMB(bytes[i], 0); @@ -74,10 +87,10 @@ static uint8_t calcSumCrumbAdd( uint8_t* bytes, uint8_t len, uint32_t mask) { sum &= mask; return sum; } -static uint8_t calcSumCrumbAddOnes( uint8_t* bytes, uint8_t len, uint32_t mask) { - return ~calcSumCrumbAdd(bytes, len, mask); +static uint16_t calcSumCrumbAddOnes( uint8_t* bytes, uint8_t len, uint32_t mask) { + return (~calcSumCrumbAdd(bytes, len, mask) & mask); } -static uint8_t calcSumNibbleAdd( uint8_t* bytes, uint8_t len, uint32_t mask) { +static uint16_t calcSumNibbleAdd( uint8_t* bytes, uint8_t len, uint32_t mask) { uint8_t sum = 0; for (uint8_t i = 0; i < len; i++) { sum += NIBBLE_LOW(bytes[i]); @@ -86,11 +99,37 @@ static uint8_t calcSumNibbleAdd( uint8_t* bytes, uint8_t len, uint32_t mask) { sum &= mask; return sum; } -static uint8_t calcSumNibbleAddOnes( uint8_t* bytes, uint8_t len, uint32_t mask){ - return ~calcSumNibbleAdd(bytes, len, mask); +static uint16_t calcSumNibbleAddOnes( uint8_t* bytes, uint8_t len, uint32_t mask){ + return (~calcSumNibbleAdd(bytes, len, mask) & mask); } - -static uint8_t calcSumByteAdd( uint8_t* bytes, uint8_t len, uint32_t mask) { +static uint16_t calcSumCrumbXor( uint8_t* bytes, uint8_t len, uint32_t mask) { + uint8_t sum = 0; + for (uint8_t i = 0; i < len; i++) { + sum ^= CRUMB(bytes[i], 0); + sum ^= CRUMB(bytes[i], 2); + sum ^= CRUMB(bytes[i], 4); + sum ^= CRUMB(bytes[i], 6); + } + sum &= mask; + return sum; +} +static uint16_t calcSumNibbleXor( uint8_t* bytes, uint8_t len, uint32_t mask) { + uint8_t sum = 0; + for (uint8_t i = 0; i < len; i++) { + sum ^= NIBBLE_LOW(bytes[i]); + sum ^= NIBBLE_HIGH(bytes[i]); + } + sum &= mask; + return sum; +} +static uint16_t calcSumByteXor( uint8_t* bytes, uint8_t len, uint32_t mask) { + uint8_t sum = 0; + for (uint8_t i = 0; i < len; i++) + sum ^= bytes[i]; + sum &= mask; + return sum; +} +static uint16_t calcSumByteAdd( uint8_t* bytes, uint8_t len, uint32_t mask) { uint8_t sum = 0; for (uint8_t i = 0; i < len; i++) sum += bytes[i]; @@ -98,21 +137,21 @@ static uint8_t calcSumByteAdd( uint8_t* bytes, uint8_t len, uint32_t mask) { return sum; } // Ones complement -static uint8_t calcSumByteAddOnes( uint8_t* bytes, uint8_t len, uint32_t mask) { - return ~calcSumByteAdd(bytes, len, mask); +static uint16_t calcSumByteAddOnes( uint8_t* bytes, uint8_t len, uint32_t mask) { + return (~calcSumByteAdd(bytes, len, mask) & mask); } -static uint8_t calcSumByteSub( uint8_t* bytes, uint8_t len, uint32_t mask) { +static uint16_t calcSumByteSub( uint8_t* bytes, uint8_t len, uint32_t mask) { uint8_t sum = 0; for (uint8_t i = 0; i < len; i++) sum -= bytes[i]; sum &= mask; return sum; } -static uint8_t calcSumByteSubOnes( uint8_t* bytes, uint8_t len, uint32_t mask){ - return ~calcSumByteSub(bytes, len, mask); +static uint16_t calcSumByteSubOnes( uint8_t* bytes, uint8_t len, uint32_t mask){ + return (~calcSumByteSub(bytes, len, mask) & mask); } -static uint8_t calcSumNibbleSub( uint8_t* bytes, uint8_t len, uint32_t mask) { +static uint16_t calcSumNibbleSub( uint8_t* bytes, uint8_t len, uint32_t mask) { uint8_t sum = 0; for (uint8_t i = 0; i < len; i++) { sum -= NIBBLE_LOW(bytes[i]); @@ -121,8 +160,34 @@ static uint8_t calcSumNibbleSub( uint8_t* bytes, uint8_t len, uint32_t mask) { sum &= mask; return sum; } -static uint8_t calcSumNibbleSubOnes( uint8_t* bytes, uint8_t len, uint32_t mask) { - return ~calcSumNibbleSub(bytes, len, mask); +static uint16_t calcSumNibbleSubOnes( uint8_t* bytes, uint8_t len, uint32_t mask) { + return (~calcSumNibbleSub(bytes, len, mask) & mask); +} + +// BSD shift checksum 8bit version +static uint16_t calcBSDchecksum8( uint8_t* bytes, uint8_t len, uint32_t mask){ + uint16_t sum = 0; + for(uint8_t i = 0; i < len; i++){ + sum = ((sum & 0xFF) >> 1) | ((sum & 0x1) << 7); // rotate accumulator + sum += bytes[i]; // add next byte + sum &= 0xFF; // + } + sum &= mask; + return sum; +} +// BSD shift checksum 4bit version +static uint16_t calcBSDchecksum4( uint8_t* bytes, uint8_t len, uint32_t mask){ + uint16_t sum = 0; + for(uint8_t i = 0; i < len; i++){ + sum = ((sum & 0xF) >> 1) | ((sum & 0x1) << 3); // rotate accumulator + sum += NIBBLE_HIGH(bytes[i]); // add high nibble + sum &= 0xF; // + sum = ((sum & 0xF) >> 1) | ((sum & 0x1) << 3); // rotate accumulator + sum += NIBBLE_LOW(bytes[i]); // add low nibble + sum &= 0xF; // + } + sum &= mask; + return sum; } // measuring LFSR maximum length @@ -218,8 +283,9 @@ int CmdAnalyseCHKSUM(const char *Cmd){ uint8_t data[50]; uint8_t cmdp = 0; - uint32_t mask = 0xFF; + uint32_t mask = 0xFFFF; bool errors = false; + bool useHeader = false; int len = 0; memset(data, 0x0, sizeof(data)); @@ -237,6 +303,11 @@ int CmdAnalyseCHKSUM(const char *Cmd){ mask = param_get32ex(Cmd, cmdp+1, 0, 16); cmdp += 2; break; + case 'v': + case 'V': + useHeader = true; + cmdp++; + break; case 'h': case 'H': return usage_analyse_checksum(); @@ -250,21 +321,28 @@ int CmdAnalyseCHKSUM(const char *Cmd){ //Validations if(errors) return usage_analyse_checksum(); - PrintAndLog("\nByte Add | 0x%X", calcSumByteAdd(data, len, mask)); - PrintAndLog("Nibble Add | 0x%X", calcSumNibbleAdd(data, len, mask)); - PrintAndLog("Crumb Add | 0x%X", calcSumCrumbAdd(data, len, mask)); - - PrintAndLog("\nByte Subtract | 0x%X", calcSumByteSub(data, len, mask)); - PrintAndLog("Nibble Subtract | 0x%X", calcSumNibbleSub(data, len, mask)); - - PrintAndLog("\nCHECKSUM - One's complement"); - PrintAndLog("Byte Add | 0x%X", calcSumByteAddOnes(data, len, mask)); - PrintAndLog("Nibble Add | 0x%X", calcSumNibbleAddOnes(data, len, mask)); - PrintAndLog("Crumb Add | 0x%X", calcSumCrumbAddOnes(data, len, mask)); - - PrintAndLog("Byte Subtract | 0x%X", calcSumByteSubOnes(data, len, mask)); - PrintAndLog("Nibble Subtract | 0x%X", calcSumNibbleSubOnes(data, len, mask)); - + if (useHeader) { + PrintAndLog(" add | sub | add 1's compl | sub 1's compl | xor"); + PrintAndLog("byte nibble crumb | byte nibble | byte nibble cumb | byte nibble | byte nibble cumb | BSD |"); + PrintAndLog("------------------+-------------+------------------+-----------------+--------------------"); + } + PrintAndLog("0x%X 0x%X 0x%X | 0x%X 0x%X | 0x%X 0x%X 0x%X | 0x%X 0x%X | 0x%X 0x%X 0x%X | 0x%X 0x%X |\n", + calcSumByteAdd(data, len, mask) + , calcSumNibbleAdd(data, len, mask) + , calcSumCrumbAdd(data, len, mask) + , calcSumByteSub(data, len, mask) + , calcSumNibbleSub(data, len, mask) + , calcSumByteAddOnes(data, len, mask) + , calcSumNibbleAddOnes(data, len, mask) + , calcSumCrumbAddOnes(data, len, mask) + , calcSumByteSubOnes(data, len, mask) + , calcSumNibbleSubOnes(data, len, mask) + , calcSumByteXor(data, len, mask) + , calcSumNibbleXor(data, len, mask) + , calcSumCrumbXor(data, len, mask) + , calcBSDchecksum8(data, len, mask) + , calcBSDchecksum4(data, len, mask) + ); return 0; } @@ -309,24 +387,140 @@ int CmdAnalyseTEASelfTest(const char *Cmd){ } int CmdAnalyseA(const char *Cmd){ +/* +piwi +// uid(2e086b1a) nt(230736f6) ks(0b0008000804000e) nr(000000000) +// uid(2e086b1a) nt(230736f6) ks(0e0b0e0b090c0d02) nr(000000001) +// uid(2e086b1a) nt(230736f6) ks(0e05060e01080b08) nr(000000002) +uint64_t d1[] = {0x2e086b1a, 0x230736f6, 0x0000001, 0x0e0b0e0b090c0d02}; +uint64_t d2[] = {0x2e086b1a, 0x230736f6, 0x0000002, 0x0e05060e01080b08}; + +// uid(17758822) nt(c0c69e59) ks(080105020705040e) nr(00000001) +// uid(17758822) nt(c0c69e59) ks(01070a05050c0705) nr(00000002) +uint64_t d1[] = {0x17758822, 0xc0c69e59, 0x0000001, 0x080105020705040e}; +uint64_t d2[] = {0x17758822, 0xc0c69e59, 0x0000002, 0x01070a05050c0705}; -// uid(2e086b1a) nt(230736f6) par(0000000000000000) ks(0b0008000804000e) nr(000000000) -// uid(2e086b1a) nt(230736f6) par(0000000000000000) ks(0e0b0e0b090c0d02) nr(000000001) -// uid(2e086b1a) nt(230736f6) par(0000000000000000) ks(0e05060e01080b08) nr(000000002) - uint32_t uid = 0x2e086b1a, nt = 0x230736f6, nr = 0x000000001; - uint64_t ks_list = 0x0e0b0e0b090c0d02, r_key = 0; +// uid(6e442129) nt(8f699195) ks(090d0b0305020f02) nr(00000001) +// uid(6e442129) nt(8f699195) ks(03030508030b0c0e) nr(00000002) +// uid(6e442129) nt(8f699195) ks(02010f030c0d050d) nr(00000003) +// uid(6e442129) nt(8f699195) ks(00040f0f0305030e) nr(00000004) +uint64_t d1[] = {0x6e442129, 0x8f699195, 0x0000001, 0x090d0b0305020f02}; +uint64_t d2[] = {0x6e442129, 0x8f699195, 0x0000004, 0x00040f0f0305030e}; + +uid(3e172b29) nt(039b7bd2) ks(0c0e0f0505080800) nr(00000001) +uid(3e172b29) nt(039b7bd2) ks(0e06090d03000b0f) nr(00000002) +*/ + uint64_t key = 0; + uint64_t d1[] = {0x3e172b29, 0x039b7bd2, 0x0000001, 0x0c0e0f0505080800}; + uint64_t d2[] = {0x3e172b29, 0x039b7bd2, 0x0000002, 0x0e06090d03000b0f}; + + nonce2key_ex(0, 0 , d1[0], d1[1], d1[2], d1[3], &key); + nonce2key_ex(0, 0 , d2[0], d2[1], d2[2], d2[3], &key); + return 0; +} - nonce2key_ex(0, 0 , uid, nt, nr, ks_list, &r_key); +static void permute(uint8_t *data, uint8_t len, uint8_t *output){ +#define KEY_SIZE 8 - nr = 0x000000002; - ks_list = 0x0e05060e01080b08; - nonce2key_ex(0, 0 , uid, nt, nr, ks_list, &r_key); + if ( len > KEY_SIZE ) { + for(uint8_t m = 0; m < len; m += KEY_SIZE){ + permute(data+m, KEY_SIZE, output+m); + } + return; + } + if ( len != KEY_SIZE ) { + printf("wrong key size\n"); + return; + } + uint8_t i,j,p, mask; + for( i=0; i < KEY_SIZE; ++i){ + p = 0; + mask = 0x80 >> i; + for( j=0; j < KEY_SIZE; ++j){ + p >>= 1; + if (data[j] & mask) + p |= 0x80; + } + output[i] = p; + } +} +static void permute_rev(uint8_t *data, uint8_t len, uint8_t *output){ + permute(data, len, output); + permute(output, len, data); + permute(data, len, output); +} +static void simple_crc(uint8_t *data, uint8_t len, uint8_t *output){ + uint8_t crc = 0; + for( uint8_t i=0; i < len; ++i){ + // seventh byte contains the crc. + if ( (i & 0x7) == 0x7 ) { + output[i] = crc ^ 0xFF; + crc = 0; + } else { + output[i] = data[i]; + crc ^= data[i]; + } + } +} +// DES doesn't use the MSB. +static void shave(uint8_t *data, uint8_t len){ + for (uint8_t i=0; i>= 1; + + memcpy(key, data, 8); + + if ( isReverse ) { + generate_rev(data, len); + permutekey_rev(key, key_std_format); + printf(" holiman iclass key | %s \n", sprint_hex(key_std_format, 8)); + } + else { + generate(data, len); + permutekey(key, key_iclass_format); + printf(" holiman std key | %s \n", sprint_hex(key_iclass_format, 8)); + } return 0; } - static command_t CommandTable[] = { {"help", CmdHelp, 1, "This help"}, {"lcr", CmdAnalyseLCR, 1, "Generate final byte for XOR LRC"}, @@ -336,6 +530,7 @@ static command_t CommandTable[] = { {"tea", CmdAnalyseTEASelfTest, 1, "Crypto TEA test"}, {"lfsr", CmdAnalyseLfsr, 1, "LFSR tests"}, {"a", CmdAnalyseA, 1, "num bits test"}, + {"hid", CmdAnalyseHid, 1, "Permute function from 'heart of darkness' paper"}, {NULL, NULL, 0, NULL} };