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

Change some numbers with corresponding constants.

Browse source
This commit is contained in:
Romain Tartiere 2010-11-20 14:19:04 +00:00
parent a643e9149d
commit d05f008e76
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
libfreefare/mifare_desfire_authenticate.c
View file

@ -142,11 +142,10 @@ mifare_cryto_preprocess_data (MifareTag tag, void *data, size_t *nbytes, off_t o
return data; return data;
switch (communication_settings) { switch (communication_settings) {
case 0: case MDCM_PLAIN:
case 2:
res = data; res = data;
break; break;
case 1: 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;
if (!(res = assert_crypto_buffer_size (tag, edl))) if (!(res = assert_crypto_buffer_size (tag, edl)))
abort(); abort();
@ -170,7 +169,7 @@ mifare_cryto_preprocess_data (MifareTag tag, void *data, size_t *nbytes, off_t o
*nbytes += 4; *nbytes += 4;
break; break;
case 3: case MDCM_ENCIPHERED:
edl = enciphered_data_length (MIFARE_DESFIRE (tag)->session_key, *nbytes - offset) + offset; edl = enciphered_data_length (MIFARE_DESFIRE (tag)->session_key, *nbytes - offset) + offset;
if (!(res = assert_crypto_buffer_size (tag, edl))) if (!(res = assert_crypto_buffer_size (tag, edl)))
abort(); abort();
@ -203,10 +202,9 @@ mifare_cryto_postprocess_data (MifareTag tag, void *data, ssize_t *nbytes, int c
void *edata; void *edata;
switch (communication_settings) { switch (communication_settings) {
case 0: case MDCM_PLAIN:
case 2:
break; break;
case 1: case MDCM_MACED:
*nbytes -= 4; *nbytes -= 4;
edl = enciphered_data_length (MIFARE_DESFIRE (tag)->session_key, *nbytes); edl = enciphered_data_length (MIFARE_DESFIRE (tag)->session_key, *nbytes);
@ -229,7 +227,7 @@ mifare_cryto_postprocess_data (MifareTag tag, void *data, ssize_t *nbytes, int c
free (edata); free (edata);
break; break;
case 3: case MDCM_ENCIPHERED:
mifare_cbc_des (MIFARE_DESFIRE (tag)->session_key, MIFARE_DESFIRE (tag)->ivect, res, *nbytes, MD_RECEIVE, 0); mifare_cbc_des (MIFARE_DESFIRE (tag)->session_key, MIFARE_DESFIRE (tag)->ivect, res, *nbytes, MD_RECEIVE, 0);
/* /*