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

Add some shortcuts.

Browse source
This commit is contained in:
Romain Tartiere 2010-11-20 22:24:36 +00:00
parent d05f008e76
commit 8975c60de7
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libfreefare/mifare_desfire_authenticate.c
View file

@ -133,7 +133,7 @@ assert_crypto_buffer_size (MifareTag tag, size_t nbytes)
void * void *
mifare_cryto_preprocess_data (MifareTag tag, void *data, size_t *nbytes, off_t offset, int communication_settings) mifare_cryto_preprocess_data (MifareTag tag, void *data, size_t *nbytes, off_t offset, int communication_settings)
{ {
void *res; void *res = data;
uint8_t mac[4]; uint8_t mac[4];
size_t edl, mdl; size_t edl, mdl;
MifareDESFireKey key = MIFARE_DESFIRE (tag)->session_key; MifareDESFireKey key = MIFARE_DESFIRE (tag)->session_key;
@ -141,9 +141,12 @@ mifare_cryto_preprocess_data (MifareTag tag, void *data, size_t *nbytes, off_t o
if (!key) if (!key)
return data; return data;
// Return directly if we just have a command code.
if (1 == *nbytes)
return data;
switch (communication_settings) { switch (communication_settings) {
case MDCM_PLAIN: case MDCM_PLAIN:
res = data;
break; break;
case MDCM_MACED: case MDCM_MACED:
edl = padded_data_length (*nbytes - offset, key_block_size (MIFARE_DESFIRE (tag)->session_key)) + offset; edl = padded_data_length (*nbytes - offset, key_block_size (MIFARE_DESFIRE (tag)->session_key)) + offset;
@ -201,6 +204,10 @@ mifare_cryto_postprocess_data (MifareTag tag, void *data, ssize_t *nbytes, int c
size_t edl; size_t edl;
void *edata; void *edata;
// Return directly if we just have a status code.
if (1 == *nbytes)
return res;
switch (communication_settings) { switch (communication_settings) {
case MDCM_PLAIN: case MDCM_PLAIN:
break; break;