mirror of
https://github.com/RfidResearchGroup/proxmark3.git
synced 2024-12-31 04:39:49 +08:00
textaul, worked return codes for tests and swaped to printandlog
This commit is contained in:
parent
ddb432ec8f
commit
f3b4028e8a
6 changed files with 130 additions and 138 deletions
|
@ -169,12 +169,17 @@ void printarr_human_readable(const char *title, uint8_t *arr, int len) {
|
|||
if (arr == NULL) return;
|
||||
|
||||
int cx = 0, i;
|
||||
size_t outsize = 100 + strlen(title) + len * 4;
|
||||
size_t outsize = 100 + strlen(title) + (len * 4);
|
||||
char *output = calloc(outsize, sizeof(char));
|
||||
PrintAndLogEx(INFO, "%s", title);
|
||||
for (i = 0; i < len; i++) {
|
||||
if (i % 16 == 0)
|
||||
cx += snprintf(output + cx, outsize - cx, "\n%02x| ", i);
|
||||
if (i % 16 == 0) {
|
||||
|
||||
if (i == 0)
|
||||
cx += snprintf(output + cx, outsize - cx, "%02x| ", i);
|
||||
else
|
||||
cx += snprintf(output + cx, outsize - cx, "\n%02x| ", i);
|
||||
}
|
||||
cx += snprintf(output + cx, outsize - cx, "%02x ", *(arr + i));
|
||||
}
|
||||
PrintAndLogEx(INFO, output);
|
||||
|
@ -199,9 +204,9 @@ static int testBitStream(void) {
|
|||
}
|
||||
|
||||
if (memcmp(input, output, sizeof(input)) == 0) {
|
||||
PrintAndLogEx(SUCCESS, " Bitstream test 1 ok");
|
||||
PrintAndLogEx(SUCCESS, " Bitstream test 1 (%s)", _GREEN_("ok") );
|
||||
} else {
|
||||
PrintAndLogEx(FAILED, " Bitstream test 1 failed");
|
||||
PrintAndLogEx(FAILED, " Bitstream test 1 (%s)", _RED_("failed") );
|
||||
uint8_t i;
|
||||
for (i = 0 ; i < ARRAYLEN(input) ; i++) {
|
||||
PrintAndLogEx(NORMAL, " IN %02x, OUT %02x", input[i], output[i]);
|
||||
|
@ -229,9 +234,9 @@ static int testReversedBitstream(void) {
|
|||
}
|
||||
|
||||
if (memcmp(input, output, sizeof(input)) == 0) {
|
||||
PrintAndLogEx(SUCCESS, " Bitstream test 2 ok");
|
||||
PrintAndLogEx(SUCCESS, " Bitstream test 2 (%s)", _GREEN_("ok") );
|
||||
} else {
|
||||
PrintAndLogEx(FAILED, " Bitstream test 2 failed");
|
||||
PrintAndLogEx(FAILED, " Bitstream test 2 (%s)", _RED_("failed") );
|
||||
uint8_t i;
|
||||
for (i = 0 ; i < ARRAYLEN(input) ; i++) {
|
||||
PrintAndLogEx(NORMAL, " IN %02x, MIDDLE: %02x, OUT %02x", input[i], reverse[i], output[i]);
|
||||
|
@ -241,12 +246,12 @@ static int testReversedBitstream(void) {
|
|||
return PM3_SUCCESS;
|
||||
}
|
||||
|
||||
|
||||
int testCipherUtils(void) {
|
||||
PrintAndLogEx(INFO, "Testing some internals...");
|
||||
int retval = 0;
|
||||
retval |= testBitStream();
|
||||
retval |= testReversedBitstream();
|
||||
int retval = testBitStream();
|
||||
if (retval == PM3_SUCCESS)
|
||||
retval = testReversedBitstream();
|
||||
|
||||
return retval;
|
||||
}
|
||||
#endif
|
||||
|
|
|
@ -293,7 +293,7 @@ static int _readFromDump(uint8_t dump[], dumpdata *item, uint8_t i) {
|
|||
* @return
|
||||
*/
|
||||
int bruteforceItem(dumpdata item, uint16_t keytable[]) {
|
||||
int errors = 0;
|
||||
|
||||
int found = false;
|
||||
uint8_t key_sel_p[8] = {0};
|
||||
uint8_t div_key[8] = {0};
|
||||
|
@ -334,7 +334,7 @@ int bruteforceItem(dumpdata item, uint16_t keytable[]) {
|
|||
keytable[bytes_to_recover[0]] &= ~BEING_CRACKED;
|
||||
keytable[bytes_to_recover[1]] &= ~BEING_CRACKED;
|
||||
keytable[bytes_to_recover[2]] &= ~BEING_CRACKED;
|
||||
return 1;
|
||||
return PM3_ESOFT;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -400,11 +400,13 @@ int bruteforceItem(dumpdata item, uint16_t keytable[]) {
|
|||
}
|
||||
}
|
||||
|
||||
int errors = PM3_SUCCESS;
|
||||
|
||||
if (!found) {
|
||||
PrintAndLogEx(NORMAL, "");
|
||||
PrintAndLogEx(WARNING, "Failed to recover %d bytes using the following CSN", numbytes_to_recover);
|
||||
PrintAndLogEx(INFO, "CSN %s", sprint_hex(item.csn, 8));
|
||||
errors++;
|
||||
errors = PM3_ESOFT;
|
||||
|
||||
//Before we exit, reset the 'BEING_CRACKED' to zero
|
||||
for (i = 0; i < numbytes_to_recover; i++) {
|
||||
|
@ -475,14 +477,14 @@ int calculateMasterKey(uint8_t first16bytes[], uint64_t master_key[]) {
|
|||
if (master_key != NULL)
|
||||
memcpy(master_key, key64, 8);
|
||||
|
||||
PrintAndLogEx(NORMAL, "\n");
|
||||
if (memcmp(z_0, result, 4) != 0) {
|
||||
PrintAndLogEx(WARNING, _RED_("Failed to verify") " calculated master key (k_cus)! Something is wrong.");
|
||||
return 1;
|
||||
} else {
|
||||
PrintAndLogEx(NORMAL, "\n");
|
||||
PrintAndLogEx(SUCCESS, _GREEN_("Key verified ok!"));
|
||||
}
|
||||
return 0;
|
||||
return PM3_ESOFT;
|
||||
}
|
||||
|
||||
PrintAndLogEx(SUCCESS, _GREEN_("Key verified ok!"));
|
||||
return PM3_SUCCESS;
|
||||
}
|
||||
/**
|
||||
* @brief Same as bruteforcefile, but uses a an array of dumpdata instead
|
||||
|
@ -493,27 +495,29 @@ int calculateMasterKey(uint8_t first16bytes[], uint64_t master_key[]) {
|
|||
*/
|
||||
int bruteforceDump(uint8_t dump[], size_t dumpsize, uint16_t keytable[]) {
|
||||
uint8_t i;
|
||||
int errors = 0;
|
||||
size_t itemsize = sizeof(dumpdata);
|
||||
|
||||
uint64_t t1 = msclock();
|
||||
|
||||
dumpdata *attack = (dumpdata *) calloc(itemsize, sizeof(uint8_t));
|
||||
|
||||
if (attack == NULL) {
|
||||
PrintAndLogEx(WARNING, "failed to allocate memory");
|
||||
return PM3_EMALLOC;
|
||||
}
|
||||
|
||||
int res = 0;
|
||||
for (i = 0 ; i * itemsize < dumpsize ; i++) {
|
||||
memcpy(attack, dump + i * itemsize, itemsize);
|
||||
errors += bruteforceItem(*attack, keytable);
|
||||
if (errors)
|
||||
res += bruteforceItem(*attack, keytable);
|
||||
if (res != PM3_SUCCESS)
|
||||
break;
|
||||
}
|
||||
free(attack);
|
||||
t1 = msclock() - t1;
|
||||
PrintAndLogEx(SUCCESS, "time: %" PRIu64 " seconds", t1 / 1000);
|
||||
|
||||
|
||||
if (errors) {
|
||||
if (res != PM3_SUCCESS) {
|
||||
PrintAndLogEx(ERR, "loclass exiting. Try run " _YELLOW_("`hf iclass sim 2`") " again and collect new data");
|
||||
return 1;
|
||||
return PM3_ESOFT;
|
||||
}
|
||||
|
||||
// Pick out the first 16 bytes of the keytable.
|
||||
|
@ -527,11 +531,10 @@ int bruteforceDump(uint8_t dump[], size_t dumpsize, uint16_t keytable[]) {
|
|||
|
||||
if (!(keytable[i] & CRACKED)) {
|
||||
PrintAndLogEx(WARNING, "Warning: we are missing byte %d, custom key calculation will fail...", i);
|
||||
return 1;
|
||||
return PM3_ESOFT;
|
||||
}
|
||||
}
|
||||
errors += calculateMasterKey(first16bytes, NULL);
|
||||
return errors;
|
||||
return calculateMasterKey(first16bytes, NULL);
|
||||
}
|
||||
/**
|
||||
* Perform a bruteforce against a file which has been saved by pm3
|
||||
|
@ -589,12 +592,11 @@ static int _testBruteforce(void) {
|
|||
**** The 64-bit HS Custom Key Value = 5B7C62C491C11B39 ****
|
||||
**/
|
||||
uint16_t keytable[128] = {0};
|
||||
int errors = bruteforceFile("iclass_dump.bin", keytable);
|
||||
if (errors) {
|
||||
int res = bruteforceFile("iclass_dump.bin", keytable);
|
||||
if (res != PM3_SUCCESS) {
|
||||
PrintAndLogEx(ERR, "Error: The file " _YELLOW_("iclass_dump.bin") "was not found!");
|
||||
}
|
||||
|
||||
return errors;
|
||||
return res;
|
||||
}
|
||||
|
||||
static int _test_iclass_key_permutation(void) {
|
||||
|
@ -609,18 +611,18 @@ static int _test_iclass_key_permutation(void) {
|
|||
PrintAndLogEx(ERR, "Error with iclass key permute!");
|
||||
printarr("testcase_output", testcase_output, 8);
|
||||
printarr("testcase_output_correct", testcase_output_correct, 8);
|
||||
return 1;
|
||||
return PM3_ESOFT;
|
||||
|
||||
}
|
||||
if (memcmp(testcase, testcase_output_rev, 8) != 0) {
|
||||
PrintAndLogEx(ERR, "Error with reverse iclass key permute");
|
||||
printarr("testcase", testcase, 8);
|
||||
printarr("testcase_output_rev", testcase_output_rev, 8);
|
||||
return 1;
|
||||
return PM3_ESOFT;
|
||||
}
|
||||
|
||||
PrintAndLogEx(SUCCESS, "Iclass key permutation OK!");
|
||||
return 0;
|
||||
PrintAndLogEx(SUCCESS, "Iclass key permutation (%s)", _GREEN_("OK"));
|
||||
return PM3_SUCCESS;
|
||||
}
|
||||
|
||||
static int _testHash1(void) {
|
||||
|
@ -633,9 +635,9 @@ static int _testHash1(void) {
|
|||
PrintAndLogEx(ERR, "Error with hash1!");
|
||||
printarr("calculated", k, 8);
|
||||
printarr("expected", expected, 8);
|
||||
return 1;
|
||||
return PM3_ESOFT;
|
||||
}
|
||||
return 0;
|
||||
return PM3_SUCCESS;
|
||||
}
|
||||
|
||||
int testElite(bool slowtests) {
|
||||
|
@ -662,15 +664,21 @@ int testElite(bool slowtests) {
|
|||
hash2(k_cus, keytable);
|
||||
printarr_human_readable("Hash2", keytable, 128);
|
||||
if (keytable[3] == 0xA1 && keytable[0x30] == 0xA3 && keytable[0x6F] == 0x95) {
|
||||
PrintAndLogEx(SUCCESS, "Hash2 looks fine...");
|
||||
PrintAndLogEx(SUCCESS, " Hash2 (%s)", _GREEN_("ok"));
|
||||
}
|
||||
|
||||
int errors = 0 ;
|
||||
int res = PM3_SUCCESS;
|
||||
PrintAndLogEx(INFO, "Testing hash1...");
|
||||
errors += _testHash1();
|
||||
PrintAndLogEx(INFO, "Testing key diversification ...");
|
||||
errors += _test_iclass_key_permutation();
|
||||
res += _testHash1();
|
||||
PrintAndLogEx(INFO, " hash1 (%s)", (res == PM3_SUCCESS) ? _GREEN_("ok") : _RED_("fail") );
|
||||
|
||||
PrintAndLogEx(INFO, "Testing key diversification...");
|
||||
res += _test_iclass_key_permutation();
|
||||
if (res == PM3_SUCCESS)
|
||||
PrintAndLogEx(INFO, " key diversification (%s)", (res == PM3_SUCCESS) ? _GREEN_("ok") : _RED_("fail") );
|
||||
|
||||
if (slowtests)
|
||||
errors += _testBruteforce();
|
||||
return errors;
|
||||
res += _testBruteforce();
|
||||
|
||||
return res;
|
||||
}
|
||||
|
|
|
@ -104,7 +104,7 @@ int bruteforceItem(dumpdata item, uint16_t keytable[]);
|
|||
* @param csn the CSN used
|
||||
* @param k output
|
||||
*/
|
||||
void hash1(uint8_t csn[], uint8_t k[]);
|
||||
void hash1(uint8_t *csn, uint8_t *k);
|
||||
void hash2(uint8_t *key64, uint8_t *outp_keytable);
|
||||
/**
|
||||
* From dismantling iclass-paper:
|
||||
|
|
|
@ -8,7 +8,6 @@
|
|||
#include <ctype.h>
|
||||
#include "elite_crack.h"
|
||||
|
||||
|
||||
static void calc_score(uint8_t *csn, uint8_t *k) {
|
||||
uint8_t score = 0 ;
|
||||
uint8_t i;
|
||||
|
|
|
@ -72,13 +72,17 @@ From "Dismantling iclass":
|
|||
#include "cipherutils.h"
|
||||
#include "mbedtls/des.h"
|
||||
|
||||
uint8_t pi[35] = {0x0F, 0x17, 0x1B, 0x1D, 0x1E, 0x27, 0x2B, 0x2D, 0x2E, 0x33, 0x35, 0x39, 0x36, 0x3A, 0x3C, 0x47, 0x4B, 0x4D, 0x4E, 0x53, 0x55, 0x56, 0x59, 0x5A, 0x5C, 0x63, 0x65, 0x66, 0x69, 0x6A, 0x6C, 0x71, 0x72, 0x74, 0x78};
|
||||
uint8_t pi[35] = {
|
||||
0x0F, 0x17, 0x1B, 0x1D, 0x1E, 0x27, 0x2B, 0x2D,
|
||||
0x2E, 0x33, 0x35, 0x39, 0x36, 0x3A, 0x3C, 0x47,
|
||||
0x4B, 0x4D, 0x4E, 0x53, 0x55, 0x56, 0x59, 0x5A,
|
||||
0x5C, 0x63, 0x65, 0x66, 0x69, 0x6A, 0x6C, 0x71,
|
||||
0x72, 0x74, 0x78
|
||||
};
|
||||
|
||||
static mbedtls_des_context ctx_enc;
|
||||
static mbedtls_des_context ctx_dec;
|
||||
|
||||
static int debug_print = 0;
|
||||
|
||||
/**
|
||||
* @brief The key diversification algorithm uses 6-bit bytes.
|
||||
* This implementation uses 64 bit uint to pack seven of them into one
|
||||
|
@ -219,25 +223,19 @@ static void permute(BitstreamIn *p_in, uint64_t z, int l, int r, BitstreamOut *o
|
|||
}
|
||||
}
|
||||
|
||||
static void printbegin(void) {
|
||||
if (debug_print < 2)
|
||||
return;
|
||||
|
||||
PrintAndLogEx(NORMAL, " | x| y|z0|z1|z2|z3|z4|z5|z6|z7|");
|
||||
}
|
||||
|
||||
static void printState(const char *desc, uint64_t c) {
|
||||
if (debug_print < 2)
|
||||
return;
|
||||
|
||||
printf("%s : ", desc);
|
||||
char s[60] = {0};
|
||||
snprintf(s, sizeof(s), "%s : ", desc);
|
||||
|
||||
uint8_t x = (c & 0xFF00000000000000) >> 56;
|
||||
uint8_t y = (c & 0x00FF000000000000) >> 48;
|
||||
printf(" %02x %02x", x, y);
|
||||
int i;
|
||||
for (i = 0; i < 8; i++)
|
||||
printf(" %02x", getSixBitByte(c, i));
|
||||
printf("\n");
|
||||
|
||||
snprintf(s + strlen(s), sizeof(s) - strlen(s), " %02x %02x", x, y);
|
||||
|
||||
for (uint8_t i = 0; i < 8; i++)
|
||||
snprintf(s + strlen(s), sizeof(s) - strlen(s), " %02x", getSixBitByte(c, i));
|
||||
|
||||
PrintAndLogEx(DEBUG, "%s", s);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -254,7 +252,7 @@ static void printState(const char *desc, uint64_t c) {
|
|||
void hash0(uint64_t c, uint8_t k[8]) {
|
||||
c = swapZvalues(c);
|
||||
|
||||
printbegin();
|
||||
PrintAndLogEx(DEBUG, " | x| y|z0|z1|z2|z3|z4|z5|z6|z7|");
|
||||
printState("origin", c);
|
||||
//These 64 bits are divided as c = x, y, z [0] , . . . , z [7]
|
||||
// x = 8 bits
|
||||
|
@ -286,7 +284,7 @@ void hash0(uint64_t c, uint8_t k[8]) {
|
|||
if (x & 1) //Check if x7 is 1
|
||||
p = ~p;
|
||||
|
||||
if (debug_print >= 2) PrintAndLogEx(DEBUG, "p:%02x", p);
|
||||
PrintAndLogEx(DEBUG, "p: %02x", p);
|
||||
|
||||
BitstreamIn p_in = { &p, 8, 0 };
|
||||
uint8_t outbuffer[] = {0, 0, 0, 0, 0, 0, 0, 0};
|
||||
|
@ -297,7 +295,7 @@ void hash0(uint64_t c, uint8_t k[8]) {
|
|||
// if all went well
|
||||
//Shift z-values down onto the lower segment
|
||||
|
||||
uint64_t zTilde = x_bytes_to_num(outbuffer, 8);
|
||||
uint64_t zTilde = x_bytes_to_num(outbuffer, sizeof(outbuffer));
|
||||
|
||||
zTilde >>= 16;
|
||||
|
||||
|
@ -353,7 +351,7 @@ void hash0(uint64_t c, uint8_t k[8]) {
|
|||
* @param key
|
||||
* @param div_key
|
||||
*/
|
||||
void diversifyKey(uint8_t csn[8], uint8_t key[8], uint8_t div_key[8]) {
|
||||
void diversifyKey(uint8_t* csn, uint8_t* key, uint8_t* div_key) {
|
||||
// Prepare the DES key
|
||||
mbedtls_des_setkey_enc(&ctx_enc, key);
|
||||
|
||||
|
@ -363,10 +361,10 @@ void diversifyKey(uint8_t csn[8], uint8_t key[8], uint8_t div_key[8]) {
|
|||
mbedtls_des_crypt_ecb(&ctx_enc, csn, crypted_csn);
|
||||
|
||||
//Calculate HASH0(DES))
|
||||
uint64_t crypt_csn = x_bytes_to_num(crypted_csn, 8);
|
||||
uint64_t c_csn = x_bytes_to_num(crypted_csn, sizeof(crypted_csn));
|
||||
//uint64_t crypted_csn_swapped = swapZvalues(crypt_csn);
|
||||
|
||||
hash0(crypt_csn, div_key);
|
||||
hash0(c_csn, div_key);
|
||||
}
|
||||
/*
|
||||
static void testPermute(void) {
|
||||
|
@ -571,58 +569,42 @@ static int testKeyDiversificationWithMasterkeyTestcases(void) {
|
|||
return error;
|
||||
}
|
||||
|
||||
static void print64bits(const char *name, uint64_t val) {
|
||||
printf("%s%08x%08x\n", name, (uint32_t)(val >> 32), (uint32_t)(val & 0xFFFFFFFF));
|
||||
}
|
||||
static int testCryptedCSN(uint64_t crypted_csn, uint64_t expected) {
|
||||
|
||||
static uint64_t testCryptedCSN(uint64_t crypted_csn, uint64_t expected) {
|
||||
int retval = 0;
|
||||
uint8_t result[8] = {0};
|
||||
if (debug_print) {
|
||||
PrintAndLogEx(DEBUG, "debug_print %d", debug_print);
|
||||
print64bits(" {csn} ", crypted_csn);
|
||||
}
|
||||
|
||||
uint64_t crypted_csn_swapped = swapZvalues(crypted_csn);
|
||||
|
||||
if (debug_print) print64bits(" {csn-revz} ", crypted_csn_swapped);
|
||||
|
||||
hash0(crypted_csn, result);
|
||||
uint64_t resultbyte = x_bytes_to_num(result, 8);
|
||||
if (debug_print) print64bits(" hash0 ", resultbyte);
|
||||
|
||||
PrintAndLogEx(DEBUG, "");
|
||||
PrintAndLogEx(DEBUG, " {csn} %"PRIx64, crypted_csn);
|
||||
PrintAndLogEx(DEBUG, " {csn-revz} %"PRIx64, crypted_csn_swapped);
|
||||
PrintAndLogEx(DEBUG, " hash0 %"PRIx64 " (%s)", resultbyte, (resultbyte == expected) ? _GREEN_("OK") : _RED_("FAIL") );
|
||||
|
||||
if (resultbyte != expected) {
|
||||
if (debug_print) {
|
||||
PrintAndLogEx(NORMAL, "\n");
|
||||
PrintAndLogEx(FAILED, "FAIL!");
|
||||
print64bits(" expected ", expected);
|
||||
}
|
||||
retval = 1;
|
||||
} else {
|
||||
if (debug_print) PrintAndLogEx(SUCCESS, "[OK]");
|
||||
PrintAndLogEx(DEBUG, " expected " _YELLOW_("%"PRIx64), expected);
|
||||
return PM3_ESOFT;
|
||||
}
|
||||
return retval;
|
||||
return PM3_SUCCESS;
|
||||
}
|
||||
|
||||
static int testDES2(uint64_t csn, uint64_t expected) {
|
||||
uint8_t result[8] = {0};
|
||||
uint8_t input[8] = {0};
|
||||
|
||||
print64bits(" csn ", csn);
|
||||
PrintAndLogEx(DEBUG, " csn %"PRIx64, csn);
|
||||
x_num_to_bytes(csn, 8, input);
|
||||
|
||||
mbedtls_des_crypt_ecb(&ctx_enc, input, result);
|
||||
|
||||
uint64_t crypt_csn = x_bytes_to_num(result, 8);
|
||||
print64bits(" {csn} ", crypt_csn);
|
||||
print64bits(" expected ", expected);
|
||||
|
||||
if (expected == crypt_csn) {
|
||||
PrintAndLogEx(SUCCESS, "OK");
|
||||
return 0;
|
||||
} else {
|
||||
return 1;
|
||||
}
|
||||
PrintAndLogEx(DEBUG, " {csn} %"PRIx64, crypt_csn);
|
||||
PrintAndLogEx(DEBUG, " expected %"PRIx64 " (%s)", expected, (expected == crypt_csn) ? _GREEN_("OK") : _RED_("FAIL") );
|
||||
|
||||
if (expected != crypt_csn)
|
||||
return PM3_ESOFT;
|
||||
return PM3_SUCCESS;
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -632,53 +614,52 @@ static int testDES2(uint64_t csn, uint64_t expected) {
|
|||
*/
|
||||
static int doTestsWithKnownInputs(void) {
|
||||
// KSel from http://www.proxmark.org/forum/viewtopic.php?pid=10977#p10977
|
||||
int errors = 0;
|
||||
PrintAndLogEx(SUCCESS, "Testing DES encryption");
|
||||
PrintAndLogEx(INFO, "Testing DES encryption");
|
||||
uint8_t key[8] = {0x6c, 0x8d, 0x44, 0xf9, 0x2a, 0x2d, 0x01, 0xbf};
|
||||
|
||||
mbedtls_des_setkey_enc(&ctx_enc, key);
|
||||
testDES2(0xbbbbaaaabbbbeeee, 0xd6ad3ca619659e6b);
|
||||
|
||||
PrintAndLogEx(SUCCESS, "Testing hashing algorithm");
|
||||
PrintAndLogEx(INFO, "Testing hashing algorithm");
|
||||
|
||||
errors += testCryptedCSN(0x0102030405060708, 0x0bdd6512073c460a);
|
||||
errors += testCryptedCSN(0x1020304050607080, 0x0208211405f3381f);
|
||||
errors += testCryptedCSN(0x1122334455667788, 0x2bee256d40ac1f3a);
|
||||
errors += testCryptedCSN(0xabcdabcdabcdabcd, 0xa91c9ec66f7da592);
|
||||
errors += testCryptedCSN(0xbcdabcdabcdabcda, 0x79ca5796a474e19b);
|
||||
errors += testCryptedCSN(0xcdabcdabcdabcdab, 0xa8901b9f7ec76da4);
|
||||
errors += testCryptedCSN(0xdabcdabcdabcdabc, 0x357aa8e0979a5b8d);
|
||||
errors += testCryptedCSN(0x21ba6565071f9299, 0x34e80f88d5cf39ea);
|
||||
errors += testCryptedCSN(0x14e2adfc5bb7e134, 0x6ac90c6508bd9ea3);
|
||||
int res = PM3_SUCCESS;
|
||||
res += testCryptedCSN(0x0102030405060708, 0x0bdd6512073c460a);
|
||||
res += testCryptedCSN(0x1020304050607080, 0x0208211405f3381f);
|
||||
res += testCryptedCSN(0x1122334455667788, 0x2bee256d40ac1f3a);
|
||||
res += testCryptedCSN(0xabcdabcdabcdabcd, 0xa91c9ec66f7da592);
|
||||
res += testCryptedCSN(0xbcdabcdabcdabcda, 0x79ca5796a474e19b);
|
||||
res += testCryptedCSN(0xcdabcdabcdabcdab, 0xa8901b9f7ec76da4);
|
||||
res += testCryptedCSN(0xdabcdabcdabcdabc, 0x357aa8e0979a5b8d);
|
||||
res += testCryptedCSN(0x21ba6565071f9299, 0x34e80f88d5cf39ea);
|
||||
res += testCryptedCSN(0x14e2adfc5bb7e134, 0x6ac90c6508bd9ea3);
|
||||
|
||||
if (errors)
|
||||
PrintAndLogEx(FAILED, "%d errors occurred (9 testcases)", errors);
|
||||
else
|
||||
if (res != PM3_SUCCESS) {
|
||||
PrintAndLogEx(FAILED, "%d res occurred (9 testcases)", res);
|
||||
res = PM3_ESOFT;
|
||||
} else {
|
||||
PrintAndLogEx(SUCCESS, "Hashing seems to work (9 testcases)");
|
||||
return errors;
|
||||
res = PM3_SUCCESS;
|
||||
}
|
||||
return res;
|
||||
}
|
||||
|
||||
|
||||
static bool readKeyFile(uint8_t *key, size_t keylen) {
|
||||
|
||||
bool retval = false;
|
||||
size_t len = 0;
|
||||
uint8_t *keyptr = NULL;
|
||||
if (loadFile_safe("iclass_key.bin", "", (void **)&keyptr, &len) != PM3_SUCCESS) {
|
||||
return false;
|
||||
return retval;
|
||||
}
|
||||
|
||||
if (keylen != len) {
|
||||
free(keyptr);
|
||||
return false;
|
||||
if (keylen == len) {
|
||||
memcpy(key, keyptr, keylen);
|
||||
retval = true;
|
||||
}
|
||||
|
||||
memcpy(key, keyptr, keylen);
|
||||
free(keyptr);
|
||||
return true;
|
||||
return retval;
|
||||
}
|
||||
|
||||
int doKeyTests(uint8_t debuglevel) {
|
||||
debug_print = debuglevel;
|
||||
int doKeyTests(void) {
|
||||
|
||||
PrintAndLogEx(INFO, "Checking if the master key is present (iclass_key.bin)...");
|
||||
uint8_t key[8] = {0};
|
||||
|
@ -705,9 +686,8 @@ int doKeyTests(uint8_t debuglevel) {
|
|||
testKeyDiversificationWithMasterkeyTestcases();
|
||||
}
|
||||
}
|
||||
PrintAndLogEx(SUCCESS, "Testing key diversification with non-sensitive keys...");
|
||||
doTestsWithKnownInputs();
|
||||
return 0;
|
||||
PrintAndLogEx(INFO, "Testing key diversification with non-sensitive keys...");
|
||||
return doTestsWithKnownInputs();
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -52,7 +52,7 @@
|
|||
* @return
|
||||
*/
|
||||
void hash0(uint64_t c, uint8_t k[8]);
|
||||
int doKeyTests(uint8_t debuglevel);
|
||||
int doKeyTests(void);
|
||||
/**
|
||||
* @brief Performs Elite-class key diversification
|
||||
* @param csn
|
||||
|
|
Loading…
Reference in a new issue