Henry Gabryjelski
282c0904a5
visual alignment only .. no code change
2023-08-09 00:08:13 -07:00
Henry Gabryjelski
890ea0d321
const for hfops
2023-08-09 00:03:48 -07:00
Henry Gabryjelski
6f38c814a7
Note inconsistency in FPGA frame layout docs.
2023-08-08 23:59:42 -07:00
Henry Gabryjelski
6804e719e5
const for felica
2023-08-08 23:55:20 -07:00
Henry Gabryjelski
63a457c27f
const and static functions for epa
2023-08-08 23:38:26 -07:00
Henry Gabryjelski
0af484fdee
const for em4x70
2023-08-08 23:24:10 -07:00
Henry Gabryjelski
1a8ef489c8
const for em4x50
2023-08-08 23:03:34 -07:00
Henry Gabryjelski
e973aebae6
Workaround SPIFFS lack of const
2023-08-08 22:56:51 -07:00
Henry Gabryjelski
b279df2d46
more const - spiffs
2023-08-08 22:50:34 -07:00
Henry Gabryjelski
31645c56b0
more use of const
2023-08-08 21:09:31 -07:00
Henry Gabryjelski
7801abf7a5
Localize effect of unused macro
2023-08-08 21:06:17 -07:00
Henry Gabryjelski
5bd8058113
More const
enabled
2023-08-08 21:03:36 -07:00
Henry Gabryjelski
5e71621c69
const
improvement for BigBuf.h
2023-08-08 20:52:21 -07:00
iceman1001
007f9fcffb
style
2023-08-03 13:02:42 +02:00
Philippe Teuwen
cb72897b17
mkversion.sh
: now regenerates version_pm3.c (and consequently the binaries) only when needed
...
and add --force to forcibly regenerate version_pm3.c
and small fixes:
* document mkversion.sh usage
* remove call to mkversion.sh in client/experimental_lib/CMakeLists.txt on release
* remove call to old `mkversion.pl` in bootrom/Makefile
* just in case, mkversion.sh takes care of atomic write of the file
2023-08-03 01:03:24 +02:00
iceman1001
97a1f97308
style
2023-07-27 23:42:06 +02:00
iceman1001
4e6962864a
fix loading mifare keys to flash memory, forgot to wipe the new area which we extended to
2023-07-27 22:53:01 +02:00
iceman1001
58f9ba0abf
ugly hack to load the signature data if we are on a MFC Ev1 card. First we dont want to trigger the partial read unnecessary and secondly we dont save signature data in our MFC dump file. Need to adapt the JSON format for this
2023-07-27 22:23:33 +02:00
iceman1001
8bfb915624
adapt the leftovers
2023-07-27 19:01:46 +02:00
iceman1001
64ea48e7d0
remove fct in header file.\nreverted this decline
2023-07-27 18:57:11 +02:00
iceman1001
8ef1cdbd75
inceased waiting time..
2023-07-27 18:56:11 +02:00
iceman1001
6ba002725f
rmeoved some fct devices side regarding eml get/ set
2023-07-27 18:55:41 +02:00
iceman1001
5faf625032
adapt name to match code style
2023-07-27 18:02:53 +02:00
iceman1001
d9f2d5287e
maybe the return codes are wrong in legic sim now
2023-07-27 16:46:52 +02:00
iceman1001
42700d3c51
skip sector 16 at all since it seems to always be locked down even if the keys authenticate. MFC Ev1 related and less errrors in autopwn when running against a MFC Ev1 in the dumping phase
2023-07-27 12:40:04 +02:00
iceman1001
96944aec69
reinstate less checks of data_available
2023-07-27 12:37:42 +02:00
iceman1001
123ef14667
style
2023-07-26 23:50:12 +02:00
iceman1001
fc3a518f28
There is a race condition when we go from iclass commands to mf command. Especially noticable when eload large files where we used to spam the device with usb packages.\ntry iclass eload, then mf eload, and you see the client hang. With this change we trigger a preload of the fpga image before we start uploading to the device. Current places I could trigger this bug was in eload and gsave. With this patch only the first call takes some time if fpga image must be loaded. The following goes fast.\n\n if you find that the client hangs when going between, this could be the root cause.
2023-07-26 23:47:55 +02:00
iceman1001
b696a2036f
improved the eload upload times by using large chunks. Quite much faster now.\nAddapted the dots and text for eload / sim across the client
2023-07-26 23:39:27 +02:00
iceman1001
8793f1c9c5
color
2023-07-26 23:33:05 +02:00
iceman1001
fbdf50d756
minor text stuff
2023-07-26 17:49:14 +02:00
iceman1001
1cb15c84c1
adapting hf mf cget* commands to longer timeouts. Same with the quick eload used in autopwn among others.\nAlso adapted the return codes, so its more accurate in its reporting back to the client. Also added some more informative messages
2023-07-25 21:29:31 +02:00
iceman1001
514af4cf84
missing break
2023-07-23 12:51:12 +02:00
startrekdude
44b7aa2e8b
Add a tagType for Seos cards to SimulateIso14443aInit
...
These values were observed from a standard-keyed 4K Seos card.
2023-07-21 16:02:46 -04:00
Philippe Teuwen
173379b999
Rewrote completely cmds & options lf hitag read/dump/wrbl/ta
...
for more coherence with other pm3 cmds.
Still there remain strange things but it should be a step in the right direction...
2023-07-21 01:08:24 +02:00
iceman1001
60cc36b398
Merge branch 'master' of github.com:RfidResearchGroup/proxmark3
2023-07-17 19:34:43 +02:00
iceman1001
c70e5beeac
changed legic sim to have a different loop and exit message. Added some colors in output and the return codes on deviceside for legisim now uses the same PM3_E* styled
2023-07-17 19:31:37 +02:00
iceman1001
134f09be5e
style
2023-07-17 17:46:27 +02:00
kormax
7f5e1c9657
Move custom polling frame generation logic to client
2023-07-16 19:27:38 +03:00
kormax
a9cba02514
Move custom polling frame generation logic to client
2023-07-16 17:39:32 +03:00
kormax
45ca9ab4d6
Reduce struct memory footprint by reducing array sizes
2023-07-16 16:56:07 +03:00
kormax
c4f1b0768d
Pass polling config via pointer instead of by-value, thus saving RAM
2023-07-16 16:49:31 +03:00
iceman1001
8fc05ad2a5
style
2023-07-16 15:30:43 +02:00
kormax
0094318515
Make ISO14443-A polling method more flexible
2023-07-16 14:46:30 +03:00
iceman1001
6cc59848d5
fix bug in return code for hf mf writeblock where it would say it succeeded when it didnt
2023-07-15 11:51:08 +02:00
nvx
a9c0fd0b1c
Fix regression caused by edd8e36
(PR #2021 ).
...
Mifare Classic KeyA/B were accidentally switched in some contexts.
2023-07-12 23:04:29 +10:00
iceman1001
e43f6804a1
style
2023-07-06 22:37:34 +02:00
Iceman
43fc4e1c1b
Merge pull request #2001 from d18c7db/master
...
Unified fpga folders
2023-07-05 13:49:40 +02:00
nvx
edd8e36d80
Cleanup arm-side reader-mode mifare classic block read/write code.
2023-07-04 00:11:01 +10:00
Alex
9a1f0356a6
Merge branch 'RfidResearchGroup:master' into master
2023-07-03 14:45:52 +02:00
iceman1001
ed0d18f05d
QL88 tag identification. Thanks to AnnPlusPluss and Atlab for finding the key
2023-06-28 13:27:50 +02:00
iceman1001
b0c2ad8ac2
style
2023-06-27 15:25:00 +02:00
iceman1001
f36ec46455
minor rename
2023-06-26 15:01:44 +02:00
iceman1001
adfebd6510
text
2023-06-26 15:01:08 +02:00
Iceman
e83960a43d
Merge pull request #1856 from szjiajin/MifareComplianceFix
...
Mifare compliance fix
2023-06-26 13:46:31 +02:00
iceman1001
c7d004de63
Revert "Release v4.16717 - seven"
...
This reverts commit bc18dbd847
.
2023-06-26 13:10:45 +02:00
iceman1001
bc18dbd847
Release v4.16717 - seven
2023-06-26 13:10:45 +02:00
iceman1001
f64f538519
style
2023-06-25 22:30:58 +02:00
iceman1001
d40a89b27b
improve the ecfill function used in autopwn among others. Lessen failed auth/reads by skipping s 16,17 using key A for MFC EV1 cards
2023-06-25 16:22:39 +02:00
iceman1001
74f02fef8a
style
2023-06-24 17:16:28 +02:00
iceman1001
c937e3b760
fix tear off to work with topaz wrbl. fix topas wrbl to handle LOCK/OTP block 13,14, which needs write_nonerase command, fixed output for rdbl
2023-06-24 00:02:50 +02:00
iceman1001
a4e22416b9
less debug output when an auth fails
2023-06-23 18:28:44 +02:00
iceman1001
419d0c1f5b
adapt return codes for some mifare commands and their debug logging. this will reduce debug message on the client side
2023-06-23 16:25:43 +02:00
Alex
78f2d9b958
Merge branch 'RfidResearchGroup:master' into master
2023-06-16 15:46:49 +02:00
nvx
5c9c360977
Fix hf iclass/15693 sniff trace timings.
...
Previously reader durations would be reported to be twice as long
in the trace vs reality, and as a result the start time would be
earlier than it should have been as well.
Also fixes a minor sniff trace timing with card dual subcarrier
responses.
2023-06-15 22:19:02 +10:00
Alex
cc6b9511d8
Merge branch 'RfidResearchGroup:master' into master
2023-06-05 19:47:20 +02:00
iceman1001
97eb0238b1
style
2023-06-02 10:45:04 +02:00
PhaseLoop
ec31ec2141
make bruteforce code key length independent
2023-06-01 20:13:38 +00:00
d18c7db
c59bdec4f2
Unified fpga folders
2023-05-30 19:47:27 +02:00
iceman1001
336bd06d88
type fix
2023-05-28 07:34:27 +02:00
d18c7db
c5c0ef36a7
Fix truncated FPGA upload due to incorrect integer size variable
2023-05-27 21:47:51 +02:00
iceman1001
62b184ce49
adapt usart rx to enable clocks
2023-05-27 21:12:58 +02:00
iceman1001
1d0da726ec
the clocks for usart rxtx wasnt enabled.
2023-05-27 21:10:11 +02:00
PhaseLoop
bad5c1ea61
refactor bruteforce headers and namespace
2023-05-27 11:57:39 +00:00
Iceman
1571f95a2a
Merge pull request #1982 from phaseloop/em4x50-bruteforce
...
Bruteforce engine to crack non-random 32 bit keys
2023-05-27 10:06:09 +02:00
Davi Mikael
416abae4bb
Changing token and uid of hf_msdsal
2023-05-24 09:49:40 -03:00
Davi Mikael
757e53c6ac
removing debug statement in iso14443a
2023-05-24 09:48:00 -03:00
Davi Mikael
440c5ac1fa
Merge branch 'RfidResearchGroup:master' into master
2023-05-24 09:33:20 -03:00
Jonathan Liu
d25f20fb10
hf mf sim: reduce 6ms threshold to 4ms for reset to idle
...
Fixes some readers not being able to detect the simulated card on
second Inventory command due to the RF field being powered off for
a short time before being turned on again to reset the card to idle
state.
Closes #1974
2023-05-24 15:23:37 +10:00
0xdanneh
dadaf9cd11
'Fix' writing on hitag2 in password mode
...
Needs more investigation, but it does solve the issue of write commands not working consistently
2023-05-08 20:48:41 +01:00
PhaseLoop
d74b625b8b
place bruteforce lib with em4x50 in Makefile
2023-05-08 17:20:35 +00:00
PhaseLoop
19d7851c73
run "make style"
2023-05-08 17:08:24 +00:00
phaseloop
fa033a98b2
enable em4x50 bruteforce in proxmark firmware
2023-05-06 14:47:45 +00:00
phaseloop
f09a8cfa28
add bruteforce parameters to command line
2023-05-06 14:47:45 +00:00
phaseloop
85f1785ccb
initial bruteforce module
2023-05-06 14:47:31 +00:00
Davi Mikael
2d72bbd751
Merge branch 'RfidResearchGroup:master' into master
2023-05-05 16:22:31 -03:00
Iceman
16d8bbd05f
Merge pull request #1977 from net147/hf-mf-sim-reset
...
hf mf sim: reduce 50ms threshold to 6ms for reset to idle
2023-05-05 06:40:15 +02:00
Jonathan Liu
b1839d7318
hf mf sim: reduce 50ms threshold to 6ms for reset to idle
...
Fixes reader not being able to detect the simulated card on second
Inventory command due to the RF field being powered off for only 6ms
before being turned on again to reset the card to idle state.
Closes #1974
2023-05-05 12:19:11 +10:00
flamebarke
92ec161d08
Update Makefile.inc
...
Signed-off-by: flamebarke <39644720+flamebarke@users.noreply.github.com>
2023-05-04 21:50:14 +10:00
flamebarke
0fac149a03
Update Makefile.hal
...
Signed-off-by: flamebarke <39644720+flamebarke@users.noreply.github.com>
2023-05-04 21:44:12 +10:00
flamebarke
b8c7e02ad8
Create lf_multihid.c
...
Signed-off-by: flamebarke <39644720+flamebarke@users.noreply.github.com>
2023-05-04 21:34:27 +10:00
Davi Mikael
6950344567
Adjusting hf_msdsal standalone module
2023-04-19 01:39:18 -03:00
iceman1001
ed9cdebbfa
remove some debug statement
2023-04-19 02:02:20 +02:00
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
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
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