Skip to content

Commit e529b66

Browse files
authored
Picopass: Remove elite user dictionary from Read Card (#48)
1 parent 56dec78 commit e529b66

File tree

1 file changed

+16
-6
lines changed

1 file changed

+16
-6
lines changed

picopass_worker.c

+16-6
Original file line numberDiff line numberDiff line change
@@ -282,11 +282,10 @@ ReturnCode picopass_auth(PicopassWorker* picopass_worker) {
282282
return ERR_NONE;
283283
}
284284

285-
FURI_LOG_I(TAG, "Starting user dictionary attack [Elite KDF]");
286-
err = picopass_auth_dict(picopass_worker, IclassEliteDictTypeUser);
287-
if(err == ERR_NONE) {
288-
return ERR_NONE;
289-
}
285+
/* Because size of the user dictionary and could introduce confusing delay
286+
* to the read screen (since there is no feedback), we omit checking it.
287+
* It will be checked when the user uses Elite Dict. Attack, which has a progress bar
288+
*/
290289

291290
FURI_LOG_I(TAG, "Starting system dictionary attack [Elite KDF]");
292291
err = picopass_auth_dict(picopass_worker, IclassEliteDictTypeFlipper);
@@ -579,7 +578,18 @@ void picopass_worker_elite_dict_attack(PicopassWorker* picopass_worker) {
579578

580579
err = rfalPicoPassPollerCheck(mac, &chkRes);
581580
if(err == ERR_NONE) {
582-
FURI_LOG_I(TAG, "Found key");
581+
FURI_LOG_I(
582+
TAG,
583+
"Found key: %02x%02x%02x%02x%02x%02x%02x%02x",
584+
key[0],
585+
key[1],
586+
key[2],
587+
key[3],
588+
key[4],
589+
key[5],
590+
key[6],
591+
key[7]);
592+
583593
memcpy(pacs->key, key, RFAL_PICOPASS_BLOCK_LEN);
584594
pacs->elite_kdf = elite;
585595
err = picopass_read_card(AA1);

0 commit comments

Comments
 (0)