hf mfdes chk: track found keys per application
foundKeys was indexed [keytype][keyno] with no AID dimension and was never reset between applications, so a key number recovered on one AID was skipped without a single auth attempt on every later AID. On a card with AES key 00 set on two apps, only the first one was ever reported. Give every application its own desfire_app_keys_t and hand that to the checker. Saving to json now uses a new 'mfdes v2' format keyed by AID, with a loader that round-trips it; v1 is kept for existing files. Also in the same path: - one auth error below 7 broke out of the key number loop, abandoning every remaining key number for the AID. Only an algo mismatch (4, 50, 51) skips the key type now; an invalid key number (3) skips just that key number, and a transmit error retries after a reselect - 3TDEA keys were stored 16 bytes wide and written out as 24 - -k with a 24 byte key was rejected by the parser, making the 24 byte branch unreachable - DesfireGetAIDList() wrote unbounded into a 78 byte app_ids buffer Co-Authored-By: Claude Opus 5 (1M context)
This commit is contained in:
1 parent
f5d50bb9d7
commit
2cd5285cb2
5 files changed
+284
-157
No files matched your search
@@ -30,4 +30,16 @@ typedef enum {
|
||||
T_AES = 0x03
|
||||
} DesfireCryptoAlgorithm;
|
||||
|
||||
#define DESFIRE_MAX_ALGO_COUNT 4 // T_DES ... T_AES
|
||||
#define DESFIRE_MAX_KEY_COUNT 0x0E // key numbers 0x00 ... 0x0D
|
||||
#define DESFIRE_MAX_APP_COUNT 64 // applications we keep track of per PICC
|
||||
|
||||
// Keys recovered for one application.
|
||||
// keys[algo][keyno][0] is the found flag, keys[algo][keyno][1..] the key itself.
|
||||
// `algo` is a DesfireCryptoAlgorithm, `keyno` the DESFire key number.
|
||||
typedef struct {
|
||||
uint32_t aid;
|
||||
uint8_t keys[DESFIRE_MAX_ALGO_COUNT][DESFIRE_MAX_KEY_COUNT][DESFIRE_MAX_KEY_SIZE + 1];
|
||||
} desfire_app_keys_t;
|
||||
|
||||
#endif
|
||||
Reference in new issue
Block a user