Commit graph

3292 commits

Author SHA1 Message Date
wh201906 d5cd08b30e
Fix the USB enumeration process
Keep the interval between usb_enable() and AT91F_CDC_Enumerate()
as short as possible
2023-04-13 01:11:50 +08:00
AloneLiberty 2b248e03e8
Merge branch 'master' into mf-supercard
Signed-off-by: AloneLiberty <111039319+AloneLiberty@users.noreply.github.com>
2023-04-03 21:45:32 +00:00
iceman1001 bb4dad45d9 style 2023-04-02 07:00:48 +02:00
iceman1001 0b106665d4 MFU ev1 adaptations 2023-04-02 06:58:59 +02:00
AloneLiberty 3524306bf4 Implement transfer to other block in hf mf value 2023-04-01 20:49:15 +03:00
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