Fix gallagher desfire kdf for default application card master key

This commit is contained in:
nvx 2022-05-13 17:37:11 +10:00
commit e2fe92ee3d

View file

@ -482,8 +482,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, then omit the UID. // If the keyNo == 1 or the aid is 000000, then omit the UID.
if (keyNo != 1) { if (keyNo != 1 && aid != 0x000000) {
if (*kdfInputLen < (4 + uidLen)) { if (*kdfInputLen < (4 + uidLen)) {
return PM3_EINVARG; return PM3_EINVARG;
} }