diff --git a/client/src/mifare/desfirecrypto.c b/client/src/mifare/desfirecrypto.c index af94d479d..2df705dd2 100644 --- a/client/src/mifare/desfirecrypto.c +++ b/client/src/mifare/desfirecrypto.c @@ -262,7 +262,7 @@ void DesfireCryptoEncDec(DesfireContext *ctx, DesfireCryptoOpKeyType key_type, u DesfireCryptoEncDecEx(ctx, key_type, srcdata, srcdatalen, dstdata, dir_to_send, xencode, NULL); } -static void DesfireCMACGenerateSubkeys(DesfireContext *ctx, uint8_t *sk1, uint8_t *sk2) { +void DesfireCMACGenerateSubkeys(DesfireContext *ctx, uint8_t *sk1, uint8_t *sk2) { int kbs = desfire_get_key_block_length(ctx->keyType); const uint8_t R = (kbs == 8) ? 0x1B : 0x87; @@ -323,6 +323,43 @@ void DesfireCryptoCMAC(DesfireContext *ctx, uint8_t *data, size_t len, uint8_t * memcpy(cmac, ctx->IV, kbs); } +// This function is almot like cmac(...). but with some key differences. +void MifareKdfAn10922(DesfireContext *ctx, const uint8_t *data, size_t len) { + int kbs = desfire_get_key_block_length(ctx->keyType); // 8 or 16 + if (ctx == NULL || kbs == 0 || data == NULL || len < 1 || len > 31) { + return; + } + + // AES uses 16 byte IV + if (kbs < CRYPTO_AES_BLOCK_SIZE) + kbs = CRYPTO_AES_BLOCK_SIZE; + int kbs2 = kbs * 2; + + uint8_t sk1[DESFIRE_MAX_CRYPTO_BLOCK_SIZE] = {0}; + uint8_t sk2[DESFIRE_MAX_CRYPTO_BLOCK_SIZE] = {0}; + DesfireCMACGenerateSubkeys(ctx, sk1, sk2); + + // reserv atleast 32bytes. + uint8_t buffer[DESFIRE_MAX_CRYPTO_BLOCK_SIZE * 2] = {0}; + + buffer[0] = 0x01; + memcpy(&buffer[1], data, len++); + + if (len != (kbs2)) { + buffer[len++] = 0x80; + while (len % kbs2) { + buffer[len++] = 0x00; + } + bin_xor(buffer + kbs, sk2, kbs); + } else { + bin_xor(buffer + kbs, sk1, kbs); + } + + aes_encode(NULL, ctx->key, buffer, buffer, kbs2); + + memcpy(ctx->key, buffer + kbs, kbs); +} + void DesfireDESKeySetVersion(uint8_t *key, DesfireCryptoAlgorythm keytype, uint8_t version) { if (keytype == T_AES) return; diff --git a/client/src/mifare/desfirecrypto.h b/client/src/mifare/desfirecrypto.h index fd4d2f0a5..9ac0b5c71 100644 --- a/client/src/mifare/desfirecrypto.h +++ b/client/src/mifare/desfirecrypto.h @@ -110,8 +110,10 @@ size_t DesfireSearchCRCPos(uint8_t *data, size_t datalen, uint8_t respcode, uint void DesfireCryptoEncDec(DesfireContext *ctx, DesfireCryptoOpKeyType key_type, uint8_t *srcdata, size_t srcdatalen, uint8_t *dstdata, bool encode); void DesfireCryptoEncDecEx(DesfireContext *ctx, DesfireCryptoOpKeyType key_type, uint8_t *srcdata, size_t srcdatalen, uint8_t *dstdata, bool dir_to_send, bool encode, uint8_t *iv); +void DesfireCMACGenerateSubkeys(DesfireContext *ctx, uint8_t *sk1, uint8_t *sk2); void DesfireCryptoCMAC(DesfireContext *ctx, uint8_t *srcdata, size_t srcdatalen, uint8_t *cmac); - +void MifareKdfAn10922(DesfireContext *ctx, const uint8_t *data, size_t len); + void DesfireDESKeySetVersion(uint8_t *key, DesfireCryptoAlgorythm keytype, uint8_t version); uint8_t DesfireDESKeyGetVersion(uint8_t *key); diff --git a/client/src/mifare/desfiretest.c b/client/src/mifare/desfiretest.c index 9972a6793..8720961ad 100644 --- a/client/src/mifare/desfiretest.c +++ b/client/src/mifare/desfiretest.c @@ -78,6 +78,51 @@ static bool TestCRC32(void) { return res; } +static bool TestCMACSubkeys(void) { + bool res = true; + + uint8_t key[] = {0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0xAA, 0xBB, 0xCC, 0xDD, 0xEE, 0xFF}; + + uint8_t sk1[DESFIRE_MAX_CRYPTO_BLOCK_SIZE] = {0}; + uint8_t sk2[DESFIRE_MAX_CRYPTO_BLOCK_SIZE] = {0}; + DesfireContext dctx; + DesfireSetKey(&dctx, 0, T_AES, key); + memcpy(dctx.sessionKeyMAC, key, sizeof(key)); + + DesfireCMACGenerateSubkeys(&dctx, sk1, sk2); + + uint8_t sk1test[] = {0xFB, 0xC9, 0xF7, 0x5C, 0x94, 0x13, 0xC0, 0x41, 0xDF, 0xEE, 0x45, 0x2D, 0x3F, 0x07, 0x06, 0xD1}; + uint8_t sk2test[] = {0xF7, 0x93, 0xEE, 0xB9, 0x28, 0x27, 0x80, 0x83, 0xBF, 0xDC, 0x8A, 0x5A, 0x7E, 0x0E, 0x0D, 0x25}; + + res = res && (memcmp(sk1, sk1test, sizeof(sk1test)) == 0); + res = res && (memcmp(sk2, sk2test, sizeof(sk2test)) == 0); + + if (res) + PrintAndLogEx(INFO, "CMAC subkeys...... " _GREEN_("passed")); + else + PrintAndLogEx(ERR, "CMAC subkeys...... " _RED_("fail")); + + return res; +} + +static bool TestAn10922KDFAES(void) { + bool res = true; + + uint8_t key[] = {0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0xAA, 0xBB, 0xCC, 0xDD, 0xEE, 0xFF}; + + DesfireContext dctx; + DesfireSetKey(&dctx, 0, T_AES, key); + memcpy(dctx.sessionKeyMAC, key, sizeof(key)); + + + if (res) + PrintAndLogEx(INFO, "AES An10922....... " _GREEN_("passed")); + else + PrintAndLogEx(ERR, "AES An10922....... " _RED_("fail")); + + return res; +} + // https://csrc.nist.gov/CSRC/media/Projects/Cryptographic-Standards-and-Guidelines/documents/examples/TDES_CMAC.pdf static bool TestCMAC3TDEA(void) { bool res = true; @@ -336,6 +381,8 @@ bool DesfireTest(bool verbose) { res = res && TestCRC16(); res = res && TestCRC32(); + res = res && TestCMACSubkeys(); + res = res && TestAn10922KDFAES(); res = res && TestCMAC3TDEA(); res = res && TestCMAC2TDEA(); res = res && TestCMACDES();