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

3342 commits

Author SHA1 Message Date
AloneLiberty ac5dd0ffa8
Merge branch 'master' into mf-supercard 
Signed-off-by: AloneLiberty <111039319+AloneLiberty@users.noreply.github.com>
 2023-04-01 16:42:02 +00:00
iceman1001 6e0a6aa1e6 fix detection 2023-04-01 12:43:34 +02:00
iceman1001 222ef4e084 addded static encrypted nonce checks to nested 2023-04-01 12:24:32 +02:00
AloneLiberty 0f0a5d7f04 Fix lost arguments 2023-03-28 17:25:03 +03:00
AloneLiberty d10d8c0039 And make style 2023-03-26 18:05:11 +03:00
AloneLiberty f3a3707c06
Merge branch 'master' into mf-supercard 
Signed-off-by: AloneLiberty <111039319+AloneLiberty@users.noreply.github.com>
 2023-03-26 14:58:33 +00:00
AloneLiberty 5696dd31cc Use rdbl00 instead superGen2 2023-03-26 17:52:48 +03:00
iceman1001 71ddee1386 added "hf mf gdmsetcfg" to write GDM configuration 2023-03-26 16:50:59 +02:00
AloneLiberty d434eeae60 Supercard gen1/gen2 detection in MifareCIdent 2023-03-26 17:50:17 +03:00
AloneLiberty fae8ffda44 Fix formatting and run make style 2023-03-26 16:12:39 +03:00
iceman1001 82f5c8512d mfc writes now support tear off 2023-03-26 13:58:27 +02:00
iceman1001 97e16ba764 renamed gdm getblk to config since that is what it does 2023-03-26 03:41:12 +02:00
iceman1001 ebe7cbf05f missing... 2023-03-25 15:52:18 +01:00
iceman1001 7b93de7a81 added GDM read configuration block 2023-03-25 15:00:58 +01:00
iceman1001 97dced62f4 fix CID# 405674 - array uninitialized 2023-03-21 20:55:06 +01:00
iceman1001 07f6162780 added support for the magic card called GDM. 2023-03-21 19:49:52 +01:00
iceman1001 390720144a added another gen3 test to detect gdm 2023-03-20 20:28:57 +01:00
DidierA fc4e912fc1 MifareFesFireGetInformation(): warningw when tag answer is too short 2023-03-03 17:54:11 +01:00
iceman1001 64cc21b890 init structure with zeros 2023-02-21 04:41:42 +01:00
iceman1001 6ee817aa72 init array w zero 2023-02-21 04:41:11 +01:00
Iceman 21ab53c7cf
Merge pull request #1914 from henrygab/serial_from_flash_uniqueid 
Use unique USB Serial using flash's uniqueID
 2023-02-18 21:43:06 +01:00
Henry Gabryjelski 89ce0acf31 improve const correctness 2023-02-18 12:34:16 -08:00
Henry Gabryjelski 48ca513a96 updates from make style 2023-02-17 17:27:07 -08:00
Henry Gabryjelski 44676bde72 Bootrom: Enable serial number from flash 
* Add `.ramfunc` section to bootrom loader script
* exclude spiffs functionality from flashmem.h/flashmem.c
   (allows bootrom to use flashmem)
* hide unused tick.h / flashmem.h functions from bootrom
   (not technically necessary; see comments)
* bootrom: add source files, include path, and defines when
  `PLATFORM_DEFS` defines `WITH_FLASH`
* Define `AS_BOOTROM` to indicate code is building for bootrom
 2023-02-17 17:07:13 -08:00
Henry Gabryjelski 5784c8de77 Update USB Serial Number from SPI flash's uniqueID 
Also allow flash to be separately enabled via PLATFORM_EXTRAS.

NOTE: this does *NOT* enable the serial number
in the bootrom.  Still investigating options there.
 2023-02-17 17:07:13 -08:00
iceman1001 08d2c2f1a5 style 2023-02-11 11:42:58 +01:00
Nate Sales 917b99ff47
Merge branch 'master' into iceclass-read-sim 
Signed-off-by: Nate Sales <nate@natesales.net>
 2023-02-10 21:55:57 -05:00
Nate Sales c42aa99d05 refactor: add iceclass read sim info 2023-02-10 21:55:23 -05:00
Yann GASCUEL a89239cd90 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2023-02-10 13:32:25 +01:00
Yann GASCUEL a7b699b27e fix infinity loop in SpinDelayUs() and SpinDelayUsPrecision() 
I don't know why : but AT91C_BASE_PWMC_CH0->PWMC_CCNTR value is never
equal to 0, so if start+ticks was equal to 0, it was inifity looping.
This fix may produce bit longer wait than expected in some case,
depending on if AT91C_BASE_PWMC_CH0->PWMC_CCNTR delay between 0xFFFF
and 0x0001 is just 1 step or 2...

/!\ Figure out why AT91C_BASE_PWMC_CH0->PWMC_CCNTR is never 0 and fix
it there is probably a better way to fix this infinity loop issue /!\
 2023-02-10 13:31:33 +01:00
Nate Sales b1fb181f71 feat: add standalone ICECLASS read/sim mode 2023-02-08 20:31:40 -05:00
adite dfd8c8aefc Merge branch 'master' of https://github.com/adite/proxmark3 2023-02-01 19:30:42 +01:00
adite c7825a2adf Fix bug in 'lf em 4x70 brute' command 2023-02-01 19:28:31 +01:00
Iceman cf69893641
Merge branch 'master' into fix_lf_bps 
Signed-off-by: Iceman <iceman@iuse.se>
 2023-01-30 20:24:09 +01:00
Iceman 5a4338941d
Merge branch 'master' into master 
Signed-off-by: Iceman <iceman@iuse.se>
 2023-01-30 20:18:19 +01:00
Self Not Found d81974e89c
Merge branch 'master' into fix_lf_bps 
Signed-off-by: Self Not Found <wh201906@yandex.com>
 2023-01-30 07:54:11 +08:00
iceman1001 2bd404b496 Revert "Release v4.16191 - Nitride" 
This reverts commit bec61e9185.
 2023-01-29 20:35:17 +01:00
iceman1001 bec61e9185 Release v4.16191 - Nitride 2023-01-29 20:35:17 +01:00
iceman1001 09f2bf9f02 style 2023-01-29 04:59:50 +01:00
Iceman 1c9fc565cb
Merge branch 'master' into fix_lf_bps 
Signed-off-by: Iceman <iceman@iuse.se>
 2023-01-29 04:32:57 +01:00
Iceman da8adace6b
Merge pull request #1885 from Alejandro12120/pm3generic-flash 
Add a proper way to check if a FW is RDV4
 2023-01-29 04:29:03 +01:00
Matthew Jackson 9041627ae5 Add hf 15 sub-commands for EAS, AFI, privacy mode, and passwords on SLIX tags 2023-01-28 13:37:20 -06:00
Adrian Teuscher 5d17177498 Merge branch 'master' of https://github.com/adite/proxmark3 2023-01-27 19:45:06 +01:00
Adrian Teuscher 71389e0b17 Add function to brute force partial key 2023-01-27 19:37:40 +01:00
Alejandro 63e54e94a8
Merge branch 'RfidResearchGroup:master' into pm3generic-flash 2023-01-27 15:02:19 +01:00
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
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