Commit Graph

795 Commits

Author SHA1 Message Date
RogueMaster
4d350eda4e Merge pull request #369 from qistoph/mrtd
Mrtd TEST PR
2022-10-18 02:32:57 -04:00
RogueMaster
7015c5a0f2 Merge branch 'UNLEASHED' into 420 2022-10-17 18:10:22 -04:00
MX
fd3e70492d add support for Normstahl, Mutancode, FAAC RC, XT 2022-10-17 22:43:33 +03:00
RogueMaster
b09d84e876 Merge branch 'DarkFlippers:dev' into 420 2022-10-17 14:28:28 -04:00
MX
4f7ca617cc Merge branch 'fz-dev' into dev 2022-10-17 21:20:28 +03:00
gornekich
dfbe21e720 NFC fixes part 3 (#1885)
* nfc: fix read next key
* nfc: verify new line ending in user dictionary file
* nfc: fix cache save
* nfc: add unit test for dict load
* nfc: fix total key count in dictionary

Co-authored-by: あく <alleteam@gmail.com>
2022-10-18 02:10:41 +09:00
RogueMaster
a323a665a3 Merge branch 'UNLEASHED' into 420 2022-10-13 23:01:00 -04:00
MX
d547307357 Fix DTM Neo encoder 2022-10-14 01:30:20 +03:00
RogueMaster
8e3e72288c Merge branch 'UNLEASHED' into 420 2022-10-13 13:44:38 -04:00
MX
947e44ce86 Merge branch 'fz-dev' into dev 2022-10-13 20:32:05 +03:00
Astra
55f8beef9f [FL-2876] MFC Improvements Part 2/2 (#1868)
* Remove keys incorrectly added by the key cache
* Improve responsiveness while checking for re-used keys and fix skipping keys when card is removed
* Actually check if the card is completely read
* Discard incorrect keys on a lower level
* nfc: clean up

Co-authored-by: gornekich <n.gorbadey@gmail.com>
2022-10-14 01:23:29 +09:00
MX
3dde6089fc update mfc improvements
OFW PR 1868 by Astrrra
2022-10-13 16:06:34 +03:00
MX
3a569d4be8 Merge branch 'fz-dev' into dev 2022-10-13 00:42:15 +03:00
RogueMaster
41866abb87 Merge branch 'ofwdev' into 420 2022-10-12 17:20:56 -04:00
Luke Williams
50dc2d7389 36-bit AWID (L11601 Lenel) (#1838)
* 36-bit AWID
* Rfid: correct vendor name AWIG -> AWID

Co-authored-by: Sergey Gavrilov <who.just.the.doctor@gmail.com>
Co-authored-by: あく <alleteam@gmail.com>
2022-10-13 01:31:54 +09:00
RogueMaster
8d2dc1e689 Merge branch 'UNLEASHED' into 420 2022-10-12 00:13:02 -04:00
MX
2e047ff411 allow 36-bit AWID (L11601 Lenel)
OFW PR 1838 by ae5au
2022-10-12 05:32:58 +03:00
MX
6b5631e5b0 MFC Improvements Part 2/2
OFW PR 1868 by Astrrra
2022-10-12 05:29:42 +03:00
MX
aa9f958f07 Merge branch 'fz-dev' into dev 2022-10-12 04:37:59 +03:00
MX
022315e93d Improve keeloq, add JCM support, fix Nice Smilo, MHouse, and more
now manufacturer name is saved into file, and will not change randomly, 
added support for JCM
fixed Nice Smilo, MHouse
2022-10-12 04:18:29 +03:00
RogueMaster
0286a175b7 Merge branch 'ofwdev' into 420 2022-10-11 20:07:00 -04:00
Chris van Marle
5d0025dae3 Merge remote-tracking branch 'upstream/dev' into mrtd 2022-10-11 22:14:40 +02:00
Chris van Marle
6003f85601 MRTD Show month as text 2022-10-11 22:13:42 +02:00
Chris van Marle
d1a1cbff82 MRTD Read DG1 + small changes 2022-10-11 22:13:41 +02:00
Chris van Marle
0ab7d91fb4 MRTD proper parse DO87 multi byte length 2022-10-11 22:13:39 +02:00
Chris van Marle
d3d9b67544 MRTD remove some logs. Read DG1, try DG2 2022-10-11 22:13:38 +02:00
Chris van Marle
74faab36d9 MRTD display AIDs and DGs after auth 2022-10-11 22:13:37 +02:00
Chris van Marle
89d0c315b1 MRTD multiple changes 2022-10-11 22:13:36 +02:00
Chris van Marle
2ae8e97077 MRTD add file lookup by tag and EF.COM format 2022-10-11 22:13:35 +02:00
Chris van Marle
00d674f222 Fix indention 2022-10-11 22:13:33 +02:00
Chris van Marle
69ff30e86a MRTD TLV parsing (and select) 2022-10-11 22:13:32 +02:00
Chris van Marle
b5e420c11b MRTD handle BAC decrypt+unpad 2022-10-11 22:13:31 +02:00
Chris van Marle
374f2acb62 MRTD decrypt RX APDU 2022-10-11 22:13:29 +02:00
Chris van Marle
eaeb887d6f MRTD Secure Messaging added 2022-10-11 22:13:28 +02:00
Chris van Marle
ab5e564410 MRTD WIP secure messaging 2022-10-11 22:13:27 +02:00
Chris van Marle
c221c8947e MRTD scene for auth. read 2022-10-11 22:13:26 +02:00
Chris van Marle
8796195a63 Revert "MRTD add worker method for auhtenticated read"
This reverts commit 3458ded128a3c13ddd18484c2e1be2945e951a28.
2022-10-11 22:13:25 +02:00
Chris van Marle
6abd967966 MRTD set auth method + cleanup nfc_worker 2022-10-11 22:13:24 +02:00
Chris van Marle
0f242984fb MRTD fix KMRZ for BAC 2022-10-11 22:13:22 +02:00
Chris van Marle
d9399c6559 fixup! MRTD use reader_analyzer instead of deprecated debug_pcap_worker
Clean up reader_analyzer after usage
2022-10-11 22:13:21 +02:00
Chris van Marle
6b968f7fea MRTD reread with auth 2022-10-11 22:13:20 +02:00
Chris van Marle
b1f95c5c54 MRTD add worker method for auhtenticated read 2022-10-11 22:13:17 +02:00
Chris van Marle
2e586338a1 MRTD use reader_analyzer instead of deprecated debug_pcap_worker 2022-10-11 22:13:15 +02:00
Chris van Marle
59efc2701d Merge branch 'dev' into mrtd 2022-10-11 22:13:13 +02:00
Chris van Marle
0b8a0c705c Minor warning fix in MRTD 2022-10-11 22:13:11 +02:00
Chris van Marle
b412843566 MRTD BAC support and some other improvements 2022-10-11 22:13:10 +02:00
Chris van Marle
66a507ba53 Add ISO7816 tester 2022-10-11 22:13:08 +02:00
Chris van Marle
ea4762d068 Merge branch 'dev' into mrtd 2022-10-11 22:13:08 +02:00
Chris van Marle
27a74c4b87 MRTD generalize app selection 2022-10-11 22:13:07 +02:00
Chris van Marle
c4499e221f MRTD add mrtd_bac_keys 2022-10-11 22:13:06 +02:00