Commit graph

3278 commits

Author SHA1 Message Date
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
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