crewID/libfreefare
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update CMAC code to handle 64 and 128 bit keys.

Browse source
This commit is contained in:
Romain Tartiere 2010-12-18 01:45:38 +00:00
parent 8d74401e87
commit 79f6cb20e5
3 changed files with 26 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libfreefare/freefare_internal.h
View file

@ -209,8 +209,8 @@ struct mifare_desfire_key {
} type; } type;
DES_key_schedule ks1; DES_key_schedule ks1;
DES_key_schedule ks2; DES_key_schedule ks2;
uint8_t aes_sk1[16]; uint8_t cmac_sk1[16];
uint8_t aes_sk2[16]; uint8_t cmac_sk2[16];
uint8_t aes_version; uint8_t aes_version;
}; };

40
libfreefare/mifare_desfire_authenticate.c
View file

@ -105,54 +105,58 @@ lsl (uint8_t *data, size_t len)
void void
cmac_generate_subkeys (MifareDESFireKey key) cmac_generate_subkeys (MifareDESFireKey key)
{ {
uint8_t l[16]; int kbs = key_block_size (key);
bzero (l, 16); uint8_t R = (kbs == 8) ? 0x1B : 0x87;
uint8_t ivect[16]; uint8_t l[kbs];
bzero (ivect, 16); bzero (l, kbs);
mifare_cbc_des (key, ivect, l, 16, MD_RECEIVE, 1); uint8_t ivect[kbs];
bzero (ivect, kbs);
mifare_cbc_des (key, ivect, l, kbs, MD_RECEIVE, 1);
bool xor = false; bool xor = false;
// Used to compute CMAC on complete blocks // Used to compute CMAC on complete blocks
memcpy (key->aes_sk1, l, 16); memcpy (key->cmac_sk1, l, kbs);
xor = l[0] & 0x80; xor = l[0] & 0x80;
lsl (key->aes_sk1, 16); lsl (key->cmac_sk1, kbs);
if (xor) if (xor)
key->aes_sk1[15] ^= 0x87; key->cmac_sk1[kbs-1] ^= R;
// Used to compute CMAC on the last block if non-complete // Used to compute CMAC on the last block if non-complete
memcpy (key->aes_sk2, key->aes_sk1, 16); memcpy (key->cmac_sk2, key->cmac_sk1, kbs);
xor = key->aes_sk1[0] & 0x80; xor = key->cmac_sk1[0] & 0x80;
lsl (key->aes_sk2, 16); lsl (key->cmac_sk2, kbs);
if (xor) if (xor)
key->aes_sk2[15] ^= 0x87; key->cmac_sk2[kbs-1] ^= R;
} }
void void
cmac (const MifareDESFireKey key, uint8_t *ivect, const uint8_t *data, size_t len, uint8_t *cmac) cmac (const MifareDESFireKey key, uint8_t *ivect, const uint8_t *data, size_t len, uint8_t *cmac)
{ {
uint8_t *buffer = malloc (padded_data_length (len, key_block_size (key))); int kbs = key_block_size (key);
uint8_t *buffer = malloc (padded_data_length (len, kbs));
if (!buffer) if (!buffer)
abort(); abort();
memcpy (buffer, data, len); memcpy (buffer, data, len);
if ((!len) || (len % 16)) { if ((!len) || (len % kbs)) {
buffer[len++] = 0x80; buffer[len++] = 0x80;
while (len % 16) { while (len % kbs) {
buffer[len++] = 0x00; buffer[len++] = 0x00;
} }
xor (key->aes_sk2, buffer + len - 16, 16); xor (key->cmac_sk2, buffer + len - kbs, kbs);
} else { } else {
xor (key->aes_sk1, buffer + len - 16, 16); xor (key->cmac_sk1, buffer + len - kbs, kbs);
} }
mifare_cbc_des (key, ivect, buffer, len, MD_SEND, 1); mifare_cbc_des (key, ivect, buffer, len, MD_SEND, 1);
memcpy (cmac, ivect, 16); memcpy (cmac, ivect, kbs);
free (buffer); free (buffer);
} }

4
test/test_mifare_desfire_aes.c
View file

@ -59,8 +59,8 @@ test_mifare_desfire_aes_generate_subkeys (void)
MifareDESFireKey key = mifare_desfire_aes_key_new (key_data); MifareDESFireKey key = mifare_desfire_aes_key_new (key_data);
cmac_generate_subkeys (key); cmac_generate_subkeys (key);
cut_assert_equal_memory (sk1, 16, key->aes_sk1, 16, cut_message ("Wrong sub-key 1")); cut_assert_equal_memory (sk1, 16, key->cmac_sk1, 16, cut_message ("Wrong sub-key 1"));
cut_assert_equal_memory (sk2, 16, key->aes_sk2, 16, cut_message ("Wrong sub-key 2")); cut_assert_equal_memory (sk2, 16, key->cmac_sk2, 16, cut_message ("Wrong sub-key 2"));
mifare_desfire_key_free (key); mifare_desfire_key_free (key);
} }