RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-01-09 01:36:52 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1746 from nvx/bugfix/gallagher_kdf_admin_card

Browse source 
Fix gallagher KDF generation for Admin Cards aka Reader Config Cards
This commit is contained in:
Iceman 2022-08-04 15:49:03 +02:00 committed by GitHub
commit 5f99882eac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
common/generator.c
View file

@ -491,7 +491,8 @@ int mfdes_kdf_input_gallagher(uint8_t *uid, uint8_t uidLen, uint8_t keyNo, uint3
int len = 0;
// 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)) {
return PM3_EINVARG;
}