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
16803 commits 3 branches 14 tags 86 MiB
Commit graph

3342 commits

Author SHA1 Message Date
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
Jin Jia 55f6c8aea6 Merge branch 'MifareComplianceFix' of https://github.com/szjiajin/proxmark3-ice into MifareComplianceFix 2023-01-06 06:27:39 +00:00
Jin Jia 303dbae85b Fixed a warning on uninitialized variable 2023-01-06 06:26:21 +00:00
Jin Jia 9a5c8e38b0
Merge branch 'RfidResearchGroup:master' into MifareComplianceFix 2023-01-05 10:21:00 +08: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
Jin Jia 949ef8435e changed keyB in line 896 to the correct macro 2023-01-04 07:19:29 +00:00
Jin Jia 810a89c4df Added Compliance of MIFARE Classic EV1 1K Datasheet footnote of Table 8 2023-01-04 07:11:48 +00: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
iceman1001 6d699d66bc adding support to read fuji/xerox tags, thanks to user Horror 2022-06-30 22:50:52 +02:00
merlokk 67fc919c72 make style 2022-06-28 11:45:48 +03:00
merlokk 9813f85567 read directly without dma 2022-06-27 00:30:49 +03:00
merlokk eeb7ac981c additional init 2022-06-26 11:29:34 +03:00
merlokk 5784999002 first look at the data 2022-06-25 16:11:59 +03:00
merlokk f007db6661 fill samples - get samples 2022-06-25 15:42:11 +03:00
merlokk e3a50e0e1e configuring fpga and dma 2022-06-25 14:56:24 +03:00
merlokk 541c060a5d hf read adc low level command 2022-06-25 00:36:42 +03:00
Iceman 719c51b156
Merge pull request #1697 from kormax/dev 
Update to 'hf 14a reader --ecp'
 2022-06-19 18:39:10 +02:00
kormax 8e8618c989 Replace rf reset with an s-block deselect when using 'hf 14a reader --ecp' 2022-06-16 22:31:32 +03:00
iceman1001 e2574200c0 commented out some dbg prints. They interfer with the simulation part 2022-06-16 21:16:25 +02:00
kormax 13e13b70f4 Improve 'hf 14a reader --ecp' fix performance 2022-06-16 09:04:21 +03:00
kormax 5ea305be28 Fix hf 14a reader --ecp to work consistently 2022-06-15 22:53:50 +03:00
iceman1001 cd6626829c fix: use correct target 2022-06-15 07:18:58 +02:00
iceman1001 b37eaa9282 reworked staticnested a bit 2022-06-14 21:38:32 +02:00
iceman1001 1ce495b624 fix cppcheck uninitvar 2022-06-12 12:22:05 +02:00
iceman1001 65ba68f0da fix cid #394816, #394815 2022-06-12 12:18:54 +02:00
iceman1001 372ab2af98 style 2022-06-12 11:51:50 +02:00
dx林 de0549a269 StaticNested fast decrypt(backdoor 2nt.). 2022-06-10 11:02:06 +08:00
iceman1001 c5d12bba0f adapt hw dbg to query device before setting log level 2022-06-06 18:21:28 +02:00
iceman1001 b4255eea77 simplify save files 2022-06-06 13:20:39 +02:00
mwalker33 f5170f1d18 Mifare Classic Value operations 
Added increment value, decrement value via the supplied commands and set value via the normal write command.  Also added "get" to read a value block and decode/display.
 2022-06-05 16:58:53 +10:00
iceman1001 3d0e54d85c fix format strings 2022-06-02 21:18:21 +02:00
iceman1001 023ae4c7f1 mf sim - after getting a rats from rdr , and we are not simulating a rats supporting tag, set state to idle, ie wait for WUPA/REQA 2022-06-02 05:16:34 +02:00
iceman1001 10e7da9065 fix cid 393262 2022-05-31 22:30:06 +02:00
Philippe Teuwen db21576612 remove arm-gcc 12.1 warning: array subscript -512 is outside array bounds of 'uint32_t[536870911] 2022-05-12 23:14:37 +02:00
iceman1001 a2f6d0f65f swap to other fpga image, since iso15693.c uses it. Should fix the simulation 2022-05-10 07:35:57 +02:00
iceman1001 7573205a93 fix iclass simulation 2022-05-10 07:34:17 +02:00
iceman1001 90fcec0152 add ledcontrol 2022-05-08 09:36:56 +02:00
Philippe Teuwen 9ebda88386 Add INSTALLSUDO param in Makefile.platform to limit sudo to install commands, better than sudo make install... 2022-05-03 19:04:36 +02:00
Philippe Teuwen 9880df8ca7 make style 2022-05-03 15:18:44 +02:00
iceman1001 799fa850ef twice atqa? 2022-04-30 20:55:41 +02:00
iceman1001 dc3944ab65 wrong crc 2022-04-30 20:48:45 +02:00
iceman1001 dd20083126 improved FUDAN identification and anti-collision select based on @lsylx issue #1599 2022-04-30 18:39:14 +02:00
Philippe Teuwen 7f37958144 Enable support to clone HID on EM4x05 2022-04-30 00:08:10 +02:00
Philippe Teuwen 185a45e749 Add support for cloning Viking and EM410x on EM4x05 2022-04-29 17:32:52 +02:00
Philippe Teuwen 4d264fa63c Preparing EM4100 clone to EM4305 2022-04-29 16:44:38 +02:00
acru3l f57879cbcb Fix felica_sendraw 2022-04-27 11:38:28 +09:00
iceman1001 d15eef80af removed dead link 2022-04-16 19:11:53 +02:00
iceman1001 2dd250ab80 fix initialization of bitstream buffer 2022-04-10 13:15:24 +02:00
iceman1001 8d9dd8b346 make style 2022-04-09 18:48:13 +02:00
Iceman aec3ff64e2
Merge pull request #1654 from wh201906/standalone_14a 
Make HF_14ASNIFF standalone mode compatible with old PM3 (without flashmem)
 2022-04-07 18:45:39 +02:00
wh201906 eb1e94f385
Show DownloadTraceInstructions only when the trace data is written to the flashmem 2022-04-07 19:46:50 +08:00
wh201906 3d6c21e44a
Add flashmem support for HF_14BSNIFF standalone mode 2022-04-07 19:39:49 +08:00
wh201906 dc50563ce8
Make HF_14ASNIFF standalone mode compatible with old PM3 (without flashmem) 2022-04-07 16:21:02 +08:00
Jacopo Jannone 26e6f1a584 Implement 14b sniff standalone mode 2022-04-03 02:25:35 +02:00
iceman1001 247790b833 text 2022-03-31 23:33:20 +02:00
iceman1001 95d1631bed style 2022-03-23 18:22:03 +01:00
iceman1001 df49565c04 style 2022-03-23 17:49:09 +01:00
iceman1001 7aeb462e18 convert 15readercommand to use NG frames. Removing the confusing of status and length of received package in same return param. Now returns proper status and length is a ref param 2022-03-23 17:37:40 +01:00