Fix gallagher KDF generation for Admin Cards aka Reader Config Cards

This commit is contained in:
nvx 2022-08-04 17:05:59 +10:00
parent 06e54d4399
commit bf5f6750f4

View file

@ -491,7 +491,8 @@ int mfdes_kdf_input_gallagher(uint8_t *uid, uint8_t uidLen, uint8_t keyNo, uint3
int len = 0; int len = 0;
// If the keyNo == 1 or the aid is 000000, then omit the UID. // If the keyNo == 1 or the aid is 000000, then omit the UID.
if (keyNo != 1 && aid != 0x000000) { // On the other hand, if the aid is 1f81f4 (config card) always include the UID.
if ((keyNo != 1 && aid != 0x000000) || (aid == 0x1f81f4)) {
if (*kdfInputLen < (4 + uidLen)) { if (*kdfInputLen < (4 + uidLen)) {
return PM3_EINVARG; return PM3_EINVARG;
} }