dandri/proxmark3
1
0 Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2026-10-23 08:43:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,669 Commits 3 Branches 21 Tags
181229c090440ea79b8a154c2584f3db228b32ea
Commit Graph
18669 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
iceman1001 181229c090 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2024-07-11 10:57:30 +02:00
iceman1001 05b50a6c26 fix #2418 - the tool mf_nonce_brute has in some odd cases when bruteforcing the last upper 16 bits a chance of actually decrypt the four bytes into a valid mifare classic protocol command with a valid ISO14443-a CRC. See github issue for example.\n We now bruteforce all 0xFFFF keyspace and keep track of how many candidates was found. The output has been improved to help user in this case too. 2024-07-11 10:57:19 +02:00
Iceman 11484252bb Merge pull request #2398 from tiagotriques/master 
Updated mfc_default_keys
 2024-07-10 17:26:46 +02:00
iceman1001 2a86a86a06 updated format 2024-07-10 11:04:23 +02:00
Iceman 26a9b76a2a Merge pull request #2416 from jmichelp/master 
Fix invalid Wiegand format flags.
 2024-07-09 19:21:56 +02:00
Jean-Michel Picod 06203a8c5f Fix invalid Wiegand format flags. 
Some formats were declared with not adequate flags resulting in
the format being filtered out for encoding/decoding unless explictly
setting it.
 2024-07-09 14:02:20 +02:00
Iceman 810f085aae Merge pull request #2388 from CountParadox/patch-1 
Update mfc_default_keys.dic
 2024-07-09 09:16:41 +02:00
Iceman ef97dd3f7b Merge pull request #2415 from ry4000/master 
R&Y: MFC/MFULC Dictionary and MFDES AID Update
 2024-07-08 00:21:37 +02:00
ry4000 1f74f80de1 Update aid_desfire.json 
Corrected the IST Istanbul name.

Signed-off-by: ry4000 <154689120+ry4000@users.noreply.github.com>
 2024-07-08 08:14:26 +10:00
ry4000 e5f1487804 Update mfc_default_keys.dic 
Corrected a typing error that resulted in two 13-hexadecimal character access keys.

Signed-off-by: ry4000 <154689120+ry4000@users.noreply.github.com>
 2024-07-08 08:11:24 +10:00
ry4000 5319432445 Update aid_desfire.json 
Formatting fixes.

Signed-off-by: ry4000 <154689120+ry4000@users.noreply.github.com>
 2024-07-07 10:40:33 +10:00
ry4000 d1e76d90cb Update aid_desfire.json 
Restored Disney MagicBand AID, noting that NXP TagInfo claimed that this AID is an unknown application instead of a Disney MagicBand.

Signed-off-by: ry4000 <154689120+ry4000@users.noreply.github.com>
 2024-07-07 10:38:32 +10:00
ry4000 ba6b070584 Update mfc_default_keys.dic 
Added static guest access keys for various cashless prepaid arcade payment cards.

Signed-off-by: ry4000 <154689120+ry4000@users.noreply.github.com>
 2024-07-07 10:19:55 +10:00
ry4000 6f80b5ac2f Update mfulc_default_keys.dic 
Added additonal sample keys based on how a company decided to modify the sample key as the basis for theirs; it stands to reason that if one company did that, then another company very well could have done the same.

Signed-off-by: ry4000 <154689120+ry4000@users.noreply.github.com>
 2024-07-07 08:51:53 +10:00
ry4000 9d9a49f268 Update mfulc_default_keys.dic 
Fixed typo.

Signed-off-by: ry4000 <154689120+ry4000@users.noreply.github.com>
 2024-07-07 08:35:22 +10:00
ry4000 78c5ddf8d7 Added Sample ULC Access Key 
Reference: https://fcc.report/FCC-ID/G7H-SPRFTR001/5047018.pdf

The third sample access key is added by me because the documentation placed a `00 [null]` as the last byte instead of `46 [F]`.

Signed-off-by: ry4000 <154689120+ry4000@users.noreply.github.com>
 2024-07-07 08:34:33 +10:00
ry4000 42d6fcdcac Merge branch 'RfidResearchGroup:master' into master 2024-07-07 08:08:45 +10:00
Iceman a907dc4b53 Merge branch 'master' into patch-1 
Signed-off-by: Iceman <iceman@iuse.se>
 2024-07-04 15:30:56 +02:00
Iceman d102f91069 Merge pull request #2414 from jmichelp/master 
Fix a few mistakes in Wiegand encodings
 2024-07-04 15:29:20 +02:00
Jean-Michel Picod 4124dcdce9 Fix a few mistaked in Wiegand encodings 2024-07-04 12:02:32 +02:00
ry4000 0847ec4819 Update aid_desfire.json 
Updated GWR touch IATA code; SWI is apparently a closed airport.

Signed-off-by: ry4000 <154689120+ry4000@users.noreply.github.com>
 2024-06-29 10:42:09 +10:00
ry4000 4da758adaa Update aid_desfire.json 
Added additional IST Istanbulkart AIDs

Signed-off-by: ry4000 <154689120+ry4000@users.noreply.github.com>
 2024-06-27 21:59:05 +10:00
ry4000 4b3afbfac4 Update aid_desfire.json 
Added DEL Delhi Metro AIDs

Signed-off-by: ry4000 <154689120+ry4000@users.noreply.github.com>
 2024-06-27 21:37:50 +10:00
ry4000 d8d2aed2df Update aid_desfire.json 
Added ICT PACS AIDs and updated AID descriptions

Signed-off-by: ry4000 <154689120+ry4000@users.noreply.github.com>
 2024-06-27 10:22:52 +10:00
ry4000 7e109865ba Update aid_desfire.json 
Added ITSO AIDs
Removed Incorrect IST Istanbulkart AID
Made corrections to VIT BAT description
Made other formatting corrections

Signed-off-by: ry4000 <154689120+ry4000@users.noreply.github.com>
 2024-06-27 10:18:03 +10:00
ry4000 86fd5456e2 Update aid_desfire.json 
Formatting updates.

Signed-off-by: ry4000 <154689120+ry4000@users.noreply.github.com>
 2024-06-26 17:48:55 +10:00
ry4000 3ccf238616 Update aid_desfire.json 
Interim Checks on NXP TagInfo.

Signed-off-by: ry4000 <154689120+ry4000@users.noreply.github.com>
 2024-06-26 14:25:19 +10:00
ry4000 323414b2b0 Update aid_desfire.json 
Interim checks made using NXP TagInfo.

Removed duplicate AID [Disney MagicBand], which had an entry with its AID bytes reversed.

Signed-off-by: ry4000 <154689120+ry4000@users.noreply.github.com>
 2024-06-26 14:21:53 +10:00
ry4000 19defef18b Update aid_desfire.json 
Rearranged the pacs AID order.

Signed-off-by: ry4000 <154689120+ry4000@users.noreply.github.com>
 2024-06-24 15:47:41 +10:00
ry4000 ca2dc02319 Update aid_desfire.json 
Corrected Gallagher AIDs to the PM3/Flipper Zero / NXP TagInfo format.

Signed-off-by: ry4000 <154689120+ry4000@users.noreply.github.com>
 2024-06-24 15:45:32 +10:00
Iceman 81fd620345 Merge pull request #2409 from ghiki/master 
Update lf_em4100emul.c
 2024-06-23 17:36:05 +02:00
Dani a8ac0f3053 Update lf_em4100emul.c 
Rename fucntions (to avoid conflictinf with other standalone modes), print what ID is emulating and allow exit emulation with button long-press 

Signed-off-by: Dani <danidrach@gmail.com>
 2024-06-23 17:14:59 +02:00
Iceman 8cb344ef45 Merge pull request #2408 from ry4000/master 
Update aid_desfire.json
 2024-06-22 19:23:06 +02:00
ry4000 f705504863 Update aid_desfire.json 
Added information via NXP TagInfo.

Signed-off-by: ry4000 <154689120+ry4000@users.noreply.github.com>
 2024-06-22 14:08:15 +10:00
ry4000 1c42223c6c Update aid_desfire.json 
Added a new PACS AID.

Corrected minor formatting typo.

Signed-off-by: ry4000 <154689120+ry4000@users.noreply.github.com>
 2024-06-22 10:19:05 +10:00
Iceman 57c54f300b Merge pull request #2407 from tweathers-sec/tweathers-sec 
Updated clone and sim handling for 48-Bit HID (C1k48s)
 2024-06-19 22:36:56 +02:00
@tweathers-sec f80e8d0f85 Updated clone and sim handling for 48-Bit HID (C1k48s) 2024-06-19 13:41:37 -04:00
Iceman 2a31079e78 Merge pull request #2406 from ry4000/master 
Updated aid_desfire.json
 2024-06-19 09:29:06 +02:00
ry4000 7f2486a6be Update aid_desfire.json 
Minor typo correction.

Signed-off-by: ry4000 <154689120+ry4000@users.noreply.github.com>
 2024-06-18 23:35:35 +10:00
ry4000 d2c5c99f05 Updated aid_desfire.json 
Used Notepad++ to make offline edits to avoid making further unnecessary commits.

Duplicate AIDs were removed.

AID Country, Name, Description, and Type were clarified where publicly-available information existed.

AIDs are now in category order, then further sorted by hexadecimal order.

Style Guide adhered to where possible; some Descriptions may need truncating, however.

Signed-off-by: ry4000 <154689120+ry4000@users.noreply.github.com>
 2024-06-18 23:34:53 +10:00
ry4000 dfe5ebbdd0 Merge branch 'RfidResearchGroup:master' into master 2024-06-18 22:20:17 +10:00
iceman1001 39639c803c fix a wrong size when clearning allocated memory 2024-06-15 20:36:11 +02:00
Iceman a442f46290 Merge pull request #2404 from gentilkiwi/patch-1 
Update intertic.py to support more USAGE parsing
 2024-06-14 22:29:51 +02:00
Benjamin DELPY ceddabcc98 Update intertic.py to support more USAGE parsing 
Signed-off-by: Benjamin DELPY <benjamin@gentilkiwi.com>
 2024-06-14 22:23:15 +02:00
iceman1001 283a3e44ed remove missing usage of define 2024-06-12 12:28:02 +02:00
Iceman 76b18f944a Merge pull request #2402 from secore-ly/hf-14b-sim 
Fix ISO 14443-B tag simulation
 2024-06-12 12:24:23 +02:00
Michael Jung 8209440a54 Fix ISO 14443-B tag simulation 
See https://github.com/RfidResearchGroup/proxmark3/issues/1652

- Fix Bit Coding PICC -> PCD:  Encoding for 0 and 1 bits were reversed.
- Add a frontend delay for TR0 (No subcarrier) in TransmitFor14443b_AsTag.
- Remove unconditionally prefixing the encoded data with two '1' bits.
- Improve the Type B PICC State Machine implementation.

With these improvements my PCD can read the ISO 14443-B tag emulated by a
Proxmark3 Easy.

Signed-off-by: Michael Jung <michael.jung@secore.ly>
 2024-06-11 19:05:08 +02:00
iceman1001 3e1bd8f50a the BT serial port setup on Windows didnt work properly. By adding the baud rate in the new termios settings the issue seem to be fixed. Also added some extra flushing calls and some more configuration settings for chars. 2024-06-11 14:32:35 +02:00
Iceman 0ec62afab4 Merge pull request #2401 from gentilkiwi/patch-1 
Fix a lots of parsing errors
 2024-06-11 05:44:19 +02:00
Benjamin DELPY 4bd41d3acf Fix a lots of parsing errors 
Signed-off-by: Benjamin DELPY <benjamin@gentilkiwi.com>
 2024-06-10 23:26:38 +02:00