RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-09-21 07:46:12 +08:00
Code Issues Packages Projects Releases Wiki Activity
16494 commits 3 branches 14 tags 86 MiB
Commit graph

3292 commits

Author SHA1 Message Date
George Talusan 002823dd9b
use Amiibo PACK if simulator PWD matches generated Amiibo PWD 2023-01-26 21:30:33 -05:00
iceman1001 37d059d56f style 2023-01-27 03:00:26 +01:00
Alejandro c9fb1f2cc7
Merge branch 'RfidResearchGroup:master' into pm3generic-flash 2023-01-24 23:02:19 +01:00
Alejandro 474aaed4b7
Added a proper way to check if it is rdv4 fw 2023-01-24 23:01:28 +01:00
Philippe Teuwen 1a6bb58550 Add LF_PROX2BRUTE to 4_Advanced-compilation-parameters.md 2023-01-24 15:37:36 +01:00
Philippe Teuwen 248cec793c standalone: respect alphabetical order, else it's a mess to cross-check 2023-01-24 15:34:13 +01:00
Self Not Found 7e8ffb46b7
Merge branch 'RfidResearchGroup:master' into fix_lf_bps 2023-01-24 11:12:38 +08:00
Iceman 1d99d729a7
Merge pull request #1875 from lnv42/master 
Add new Standalone mode LF_PROX2BRUT
 2023-01-22 17:30:32 +01:00
wh201906 f4879fdc17 Bypass some functions if bps is not 8 2023-01-22 15:41:07 +00:00
wh201906 239a8646b2 Fix the wrong sample count when bps!=8 2023-01-22 15:38:09 +00:00
Self Not Found f05c6a1f72 Fix the types of parameters in BitstreamOut_t 
BitstreamOut_t in client/src/loclass/cipherutils.h
is also used in client/src/cmddata.c for decimatioin,
but uint8_t is too small for such application
 2023-01-22 07:15:47 +00:00
lnv42 13106d4888
Merge branch 'master' into master 
Signed-off-by: lnv42 <34003959+lnv42@users.noreply.github.com>
 2023-01-18 11:29:22 +01:00
iceman1001 834c182d63 more intuitive text 2023-01-15 14:07:17 +01:00
Philippe Teuwen ad87e2051d build_all_firmwares.sh able to build HF_14ASNIFF HF_15SNIFF without flash 2023-01-15 02:34:01 +01:00
Philippe Teuwen 0fbc101ac5 cppcheck uninitialized vars (false positive) 2023-01-15 02:23:19 +01:00
Philippe Teuwen 17d7fb8abb cppcheck test unsigned less than zero 2023-01-15 02:23:19 +01:00
Philippe Teuwen 8ac8e3d7d0 reduce variable scopes 2023-01-15 02:23:19 +01:00
Philippe Teuwen c9984985fd make miscchecks 2023-01-14 22:23:40 +01:00
Philippe Teuwen 5d5d9d9be0 make style 2023-01-14 22:22:04 +01:00
Benjamin DELPY 21de6e750c Added standalone mode for simulatin Nedap ID 2023-01-11 23:31:23 +01:00
nvx e6ecc5320f Update armsrc and bootrom Makefiles with a .FORCE PHONY target for version_pm3.c 
This fixes issues in ProxSpace where the firmware .elf files are sometimes not rebuilt
 2023-01-09 00:57:28 +10:00
iceman1001 9888eef8dc changed hf mf wrbl and view command to look for strict readonly ACL in the data. 2023-01-06 23:53:25 +01:00
Yann GASCUEL 309603f19b Add new Standalone mode LF_PROX2BRUT: HID ProxII brueforce v2 
Trivial card number brute forcer for when you know the facility code
and want to find valid(s) card number(s).
 2023-01-06 15:57:39 +01:00
nvx 4180635218 Add --shallow option to hf iclass reader commands to do shallow (ASK) reader modulation instead of OOK. 2023-01-04 23:59:03 +10:00
iceman1001 a63257799a test of faster pack response for "hf mfu sim -t 7" 2022-12-13 21:47:25 +01:00
Jean-Michel Picod f32de52b46 Wait a bit longer for the smartcard. 
For the max 256-byte frame, SIM wasn't ready early enough, corrupting
the reception buffer with 5 spurious bytes.
Empirically, 109 clock cycles is the minimum value that worked.
Adding 1 clock cycle as a safety buffer.
 2022-12-09 13:32:17 +01:00
iceman1001 8eb6f60ba6 added a wait when init I2C, seems to increase stability 2022-12-09 07:40:41 +01:00
iceman1001 ac84e855a9 Jumps len check fix 2022-12-09 07:39:36 +01:00
iceman1001 c5582ab7c7 Changing timings, this now waits for max 276 bytes while 8051 speaks with card 2022-12-09 07:39:04 +01:00
iceman1001 4c9c0b5264 minor adaptations to timings 2022-12-09 07:37:37 +01:00
Jean-Michel Picod 07a8f7a6de Raise the buffer size even more. 
I was too conservative as it requires 261 bytes. Let's put 270 for the
peace of mind.
 2022-12-05 22:05:15 +01:00
Iceman 9f589fed9a
Merge pull request #1830 from jmichelp/master 
Smartcard module firmware 4.12
 2022-12-05 20:28:25 +01:00
Jean-Michel Picod 83e6b223c4 Adapt ARM code to comply with SIM module firmware 4.12 2022-12-05 19:35:11 +01:00
Jean-Michel Picod c2aed7900c Temporary fix buffer overflow until new SIM firmware is released 2022-12-05 16:53:59 +01:00
DidierA 2f4167ee74 Consider different behavior of some Gen4 cards. Should fix #1822 2022-12-05 01:02:36 +01:00
Iceman f9aa183382
Merge pull request #1821 from DidierA/gen4_ident 
Add Magic Gen4 GTU detection
 2022-11-25 17:23:19 +01:00
DidierA 9a0427d4d2 Add Magic Gen4 GTU detection and symbols for Gen4 GTU protocol. 2022-11-25 10:13:33 +01:00
Jean-Michel Picod 1adec4dfb2 Fix overflow in SPI memory when writing default key dictionnaries. 
Boundaries were defined in the memory layout but weren't enforced
by the client, causing an overflow when trying to load a
dictionnary that was too big.
It's too hard to enforce it on the ARM side as the command is a
generic write.
Now that limits are defined, also outputs them as part of the
`hw status` command.
 2022-11-24 03:16:58 +01:00
iceman1001 317ddf42bc style 2022-11-20 16:47:49 +01:00
iceman1001 6c163fa262 added a check for static encrypted nonces when collecting encrypted nonces for hardnested to run. Will abort the collection if detected. 2022-11-15 07:07:26 +01:00
DidierA fa95119171 style: extract flags 2022-11-14 09:44:02 +01:00
DidierA ee3e4968d3 remove MifareG4ReadWrite() 2022-11-13 02:08:23 +01:00
DidierA 885911c469 Rewrite of magic Gen4 GTU commands : refactor and speed 2022-11-09 15:49:07 +01:00
DidierA 876abf2818 Add hf mf gload, ggetblk, gsetblk 2022-11-05 19:40:38 +01:00
iceman1001 fede61296b fix return types to follow our style better. 14a/mf needs more love 2022-11-02 14:34:07 +01:00
iceman1001 063e2da49d Revert "Release v4.15864 - Radium" 
This reverts commit 93ca7b4f6e.
 2022-10-29 01:34:05 +02:00
iceman1001 93ca7b4f6e Release v4.15864 - Radium 2022-10-29 01:34:05 +02:00
iceman1001 3f92d5ee67 style 2022-10-29 01:26:12 +02:00
iceman1001 ba225905d3 changed "mf eload" / "iclass eload" to be able to transfer a file from SPIFFS to EMULATOR memory. Original idea from @natesales 2022-10-26 06:57:21 +02:00
iceman1001 5b90ea8117 skeleton code found at https://github.com/ZRD-Saar/proxmark3 2022-10-25 07:56:57 +02:00
iceman1001 71f96ba1e7 make style 2022-10-16 17:56:12 +02:00
Markus Walter 42eafc5e93 Merge branch 'master' into iso15693-improvements 2022-09-05 10:56:32 +02:00
Markus Walter 84b58129dd Fix API breakage. 2022-09-05 10:46:06 +02:00
Markus Walter 42d0c6d8c1 Use memset to zero memory for better code style. 2022-09-05 10:37:01 +02:00
Markus Walter f6096367b3 Add ISO15693 write commands to simulation. 2022-09-05 10:36:02 +02:00
Markus Walter 2d7e1d30b9 Refactor ISO 15693 READ commands to handle addressed flag. 2022-09-05 10:36:02 +02:00
Markus Walter c062c44230 Refactor emulator accessor helpers for ISO15693. 2022-09-05 10:24:52 +02:00
iceman1001 d76284aa8d style 2022-09-04 13:58:49 +02:00
iceman1001 1525a0059a fix #1771 - no default block size in call 2022-09-03 11:14:33 +02:00
Builderhummel de40ae1f05
Fix Typo 
"form" to "from" 

Signed-off-by: Builderhummel <max.kretschmann@tuhh.de>
 2022-09-02 14:47:12 +02:00
Iceman b82feee002
Merge pull request #1766 from markus-oehme-pg40/iso15693-emulation 
ISO15693 emulation
 2022-09-02 05:29:16 +02:00
Markus Walter d79bd5b6b8 Switch hf 15 sim to use image in emulator memory. 2022-09-01 18:53:31 +02:00
Markus Walter 03fa757395 Implement hf 15 eload command to move image dump to emulator. 2022-09-01 18:52:57 +02:00
mwalker33 9406ef9fd3 spiffs prep 
added define for chuck size
update changelog
 2022-09-01 08:15:30 +10:00
Markus Walter 62b577d170 Remove unused definition. 2022-08-31 12:26:51 +02:00
Markus Walter eef1ce9c33 Enhance simulation of ISO15693 devices. 
This adds the following things:
- support for reading multiple blocks,
- configurable block size,
- ability to provide a memory image.
 2022-08-31 12:25:22 +02:00
mwalker33 96876c0111 Update spiffs.c 
patch type size comparison
 2022-08-31 19:10:15 +10:00
mwalker33 d8c18e6db8 Prep spiffs for bigger data files 
- added spiffs check after flase wipe to force it to update its status
- added spiffs write and append to write in 8192 byte chunks to allow spiffs space to be freed in time.
- fixed spiffs dump to correctly handle issues if it could not allocate bugbuff space.
 2022-08-31 18:51:39 +10:00
iceman1001 79cfa1d8fa adapt SPIFFS from 128kb -> 192kb. Increased GC to fit sector size 4kb. (thanks @mwalker33) 2022-08-28 12:21:21 +02:00
Markus Walter 745928e609 Fix comments. 2022-08-26 09:28:04 +02:00
iceman1001 e18194028b style 2022-08-24 07:25:10 +02:00
iceman1001 0968b39243 fix #1694 - take in consideration pointer could be called with NULL 2022-08-16 04:18:27 +02:00
iceman1001 834023b132 add a pwd to ntag215 sim if empty 2022-07-30 10:03:51 +02:00
iceman1001 6290d50564 make style 2022-07-25 08:00:30 +02:00
iceman1001 5a8d9b7954 prep mac 2022-07-23 17:39:40 +02:00
iceman1001 0554ec220f hf plot - now uses NG 2022-07-17 19:29:47 +02:00
merlokk fb3990086e fix 2022-07-10 00:54:29 +03:00
merlokk 374f1907bb fix max|min 2022-07-10 00:47:40 +03:00
merlokk e7edefe24e fix avg 2022-07-10 00:29:25 +03:00
merlokk 903af4412a fix accum clear 2022-07-09 17:36:53 +03:00
merlokk 0b95c519ff sh sniff skip some bytes from data - arm side 2022-07-09 16:45:08 +03:00
iceman1001 11e097c1bb fixing hf search loop and lessing the debug statements 2022-07-07 23:43:45 +02:00
merlokk 5f1c41503b texkom simulation timeout and verbose fixes 2022-07-08 00:15:10 +03:00
merlokk 1a620c5563 add timeout and some debug messages 2022-07-06 19:41:08 +03:00
merlokk 7c2379ac9f rename and read parameters via struct 2022-07-06 19:03:17 +03:00
iceman1001 edffa21598 fix cid 395490, and 14a simulation 2022-07-06 14:00:19 +02:00
iceman1001 c5119e5bea fix cid 390242 - uninitialized var usage 2022-07-06 13:50:15 +02:00
iceman1001 167cca5fc0 cppchecker fixes 2022-07-06 13:45:06 +02:00
merlokk 7ed8f08e09 make style 2022-07-04 00:35:44 +03:00
merlokk be25a00444 add warning 2022-07-04 00:27:22 +03:00
merlokk 4efb9f2275 tk-17 works 2022-07-04 00:18:57 +03:00
merlokk 640f6772a5 bit encoder, works very good with real reader 2022-07-03 22:54:58 +03:00
merlokk 8571cfddbf led on/off optimization and wait for field stabization 2022-07-03 22:07:03 +03:00
merlokk 353ef6f739 duplicator works too (on the edge of the field) 2022-07-03 21:59:55 +03:00
merlokk 87db9e7ec9 pm3-pm3 works 2022-07-03 21:32:29 +03:00
merlokk e4df73738f transmit ok, timing not ok 2022-07-03 18:19:57 +03:00
merlokk 6a28ca39f6 tk13 transmit sketch 2022-07-03 00:20:56 +03:00
merlokk 3aeb745f0a encode sketch 2022-07-03 00:09:55 +03:00
merlokk 1e91895b90 simulate sketch 2022-07-02 22:45:32 +03:00
iceman1001 56525cc453 style 2022-06-30 22:54:13 +02:00