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

Change xor8() to xor() to work with buffers of any length.

Browse source
This commit is contained in:
Romain Tartiere 2010-10-29 12:07:26 +00:00
parent 13f03a60bb
commit 87a04904bc
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libfreefare/mifare_desfire_authenticate.c
View file

@ -27,7 +27,7 @@
#include <freefare.h> #include <freefare.h>
#include "freefare_internal.h" #include "freefare_internal.h"
static void xor8 (uint8_t *ivect, uint8_t *data); static void xor (const uint8_t *ivect, uint8_t *data, const size_t len);
static void mifare_des (MifareDESFireKey key, uint8_t *data, uint8_t *ivect, MifareDirection direction, int mac); static void mifare_des (MifareDESFireKey key, uint8_t *data, uint8_t *ivect, MifareDirection direction, int mac);
static size_t padded_data_length (size_t nbytes); static size_t padded_data_length (size_t nbytes);
@ -35,9 +35,9 @@ static size_t maced_data_length (size_t nbytes);
static size_t enciphered_data_length (size_t nbytes); static size_t enciphered_data_length (size_t nbytes);
static void static void
xor8 (uint8_t *ivect, uint8_t *data) xor (const uint8_t *ivect, uint8_t *data, const size_t len)
{ {
for (int i = 0; i < 8; i++) { for (size_t i = 0; i < len; i++) {
data[i] ^= ivect[i]; data[i] ^= ivect[i];
} }
} }
@ -245,7 +245,7 @@ mifare_des (MifareDESFireKey key, uint8_t *data, uint8_t *ivect, MifareDirection
uint8_t ovect[8]; uint8_t ovect[8];
if (direction == MD_SEND) { if (direction == MD_SEND) {
xor8 (ivect, data); xor (ivect, data, 8);
} else { } else {
memcpy (ovect, data, 8); memcpy (ovect, data, 8);
} }
@ -277,7 +277,7 @@ mifare_des (MifareDESFireKey key, uint8_t *data, uint8_t *ivect, MifareDirection
if (direction == MD_SEND) { if (direction == MD_SEND) {
memcpy (ivect, data, 8); memcpy (ivect, data, 8);
} else { } else {
xor8 (ivect, data); xor (ivect, data, 8);
memcpy (ivect, ovect, 8); memcpy (ivect, ovect, 8);
} }
} }