RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-02-25 08:35:56 +08:00
Code Issues Projects Releases Packages Wiki Activity
14025 commits 3 branches 15 tags 88 MiB
Commit graph

2950 commits

Author SHA1 Message Date
Anže Jenšterle
fb34db5e10
Finish renaming standalone, add documentation 2021-03-15 00:36:46 +01:00
Anže Jenšterle
ac36c06590
rename standalone 2021-03-15 00:33:27 +01:00
Anže Jenšterle
180577695e Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 into function/desfire-standalone 2021-03-13 02:16:26 +01:00
iceman1001
2bd5831f27 text 2021-03-11 09:40:02 +01:00
iceman1001
1b2091932e fix 'mem spiffs view' and bad file stats retrieval 2021-03-10 10:43:49 +01:00
iceman1001
8c16c4d95d text 2021-03-09 14:58:08 +01:00
iceman1001
ad2b0879fc added: mem spiffs view - to view a file on SPIFFS\n mem spiffs dump - now uses cliparser and NG 2021-03-09 14:38:31 +01:00
iceman1001
02aabf90d3 mem spi mount/unmount/test/check/tree/info/remove/rename/wwipe - now uses cliparser. remove/rename uses NG 2021-03-08 17:39:21 +01:00
Philippe Teuwen
e5c5629cf2 Some tunings of otptear: 
- make tearoff_delay_us and tearoff_enabled globals
- use tearoff_hook and remove Dbprintf in critical tearoff timing
- move initial write from MifareU_Otp_Tearoff to CmdHF14AMfuOtpTearoff and make it optional (old behavior was writing initial 00000000 when -d was not provided)
- tearoff: compare with initial write, not with previous tearoff outcome
- rephrase some messages
- track all begin and end of erase and write phases, with quite complex logic to cover multiple cases (starting in middle of erased phase, starting with write 0, ...) and report them
- check against initial write error
- repeat same timing (up to 10x) in case of write/read errors then quit
- typos
 2021-03-07 23:48:55 +01:00
iceman1001
dff732840f mem info - now accepts input id to facility easy testing. Signature offset also triggers erase before to enable easy updates 2021-03-07 08:56:36 +01:00
Anže Jenšterle
5633768e81 desfire emulation standalone 2021-03-05 10:58:52 +01:00
iceman1001
886104e4cb cppchecker out-of-bounds, I believe it was a false positive but... 2021-03-05 10:22:35 +01:00
iceman1001
928c0e4162 cppchecker overflow integer warning 2021-03-05 10:21:25 +01:00
iceman1001
3275decfb0 cppchecker 2021-03-05 10:21:02 +01:00
iceman1001
24ee8080e1 large dma size for demod signals 2021-03-05 10:18:02 +01:00
iceman1001
7910464a85 cppchecker 2021-02-28 19:01:38 +01:00
iceman1001
1fbb838d3a cppchecker 2021-02-24 20:46:06 +01:00
iceman1001
2184b0dde8 cppchecker 2021-02-24 14:26:21 +01:00
iceman1001
bb6ea597b4 cppchecker shadow 2021-02-24 14:17:23 +01:00
iceman1001
9395f8c8ac cppchecker 2021-02-24 00:29:50 +01:00
iceman1001
b7400d109d Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2021-02-23 23:57:56 +01:00
Iceman
e8bf717f1d
Merge pull request #1211 from tharexde/4x50_fix 
4x50 fix
 2021-02-23 23:57:41 +01:00
iceman1001
232a172ac5 rename 2021-02-23 23:54:02 +01:00
iceman1001
d9195effc7 cppchecker 2021-02-23 23:53:08 +01:00
iceman1001
4620c0b21e cppchecker fixes 2021-02-23 23:00:29 +01:00
tharexde
91cf7e3f60 Dbprintf and sprintf destroyed timing for "write password" function in standalon sim mode-> fixed 2021-02-23 22:31:35 +01:00
tharexde
db679608ec initial implementation of em4x50 standalone mode (lf_tharexde) 2021-02-15 22:48:34 +01:00
tharexde
a78fecad07 revert changes (PR follows) 2021-02-15 21:26:16 +01:00
tharexde
9a96157e82 initial implementation of em4x50 standalone mode 2021-02-14 12:42:47 +01:00
tharexde
ac0ef23d5e Merge branch 'master' into dev_4x50_standalone 
update
 2021-02-12 23:21:49 +01:00
iceman1001
1ce9053c51 hf 14a sim - less button checks and even less dataavailable checks 2021-02-12 22:08:10 +01:00
iceman1001
46d9ed20e5 added "hf jooki sim" command. Lets see if the data_available call every 8000th times doesnt interrupt with simulation process too much. 2021-02-12 10:16:24 +01:00
iceman1001
7a653e7faf textual 2021-02-12 09:10:55 +01:00
tharexde
a944ff5927 - added flash defines (RDV4) 
- modified LED signals
- cleanup
 2021-02-11 19:29:43 +01:00
tharexde
b20f532282 - added missing timeout checks 
- relocated timer resets in standalone mode
 2021-02-09 23:22:46 +01:00
Anže Jenšterle
cd36770c5e
make style 2021-02-09 16:56:55 +01:00
tharexde
a67c82ff6d clean up 2021-02-06 20:48:21 +01:00
tharexde
c5ac3c16f5 - timeout corrections 
- global parameter for password catch (used in standalone mode)
 2021-02-06 20:45:44 +01:00
tharexde
ed642855d8 global parameter for standalone mode (catch pwd sent by reader) 2021-02-06 20:00:58 +01:00
iceman1001
e3aa035be7 fix: lf config set decimate or divisor to 8 is now possible 2021-02-03 16:00:33 +01:00
iceman1001
47c27d751c lf awid/hid/io/410x watch - now works with user side abort 2021-02-02 17:55:54 +01:00
iceman1001
ed3d12724b text 2021-02-02 15:33:42 +01:00
iceman1001
aad7d4c8df text 2021-02-01 23:27:26 +01:00
iceman1001
40230532f5 text 2021-02-01 23:23:34 +01:00
iceman1001
a72058243b lcd-h is renamed 2021-01-31 01:07:51 +01:00
tharexde
b57a457254 Merge branch 'master' into dev_4x50_standalone 
solved merge conflicts
 2021-01-30 00:29:18 +01:00
iceman1001
33a17fcd67 cppchecker fixes 2021-01-29 16:47:02 +01:00
iceman1001
145a031922 coverity fix #308205 2021-01-29 16:16:46 +01:00
iceman1001
f65b5eb96d coverity fix #308194 2021-01-29 16:10:33 +01:00
tharexde
a0c92d20bb make style + cleanup 2021-01-29 00:28:05 +01:00
tharexde
82de4c134c changed LED behavior 2021-01-28 23:32:47 +01:00
iceman1001
c0f4abb8d4 cppchecker fix 2021-01-28 12:52:10 +01:00
iceman1001
3c8cefd898 forgot to remove 2021-01-28 12:51:33 +01:00
iceman1001
a9b265ff1b cppcheck fixes call from hf_aveful with NULL 2021-01-28 12:16:02 +01:00
iceman1001
3c07e264c9 cppchecker fixes 2021-01-28 12:11:24 +01:00
iceman1001
6e0673fd02 cppchecker fixes 2021-01-28 12:05:32 +01:00
iceman1001
65c11ee0e4 litte rename 2021-01-28 11:49:25 +01:00
iceman1001
a5c40fa07b minor renaming 2021-01-27 23:30:37 +01:00
iceman1001
f6462137cf standalone mode LF_EM4100RWC, LF_EM4100RSWB - odd big buff static pointer usage 2021-01-27 23:18:01 +01:00
tharexde
1c3d3b350a - used WaitUS() instead of own function for reading operations 
- used GetTicks() instead of using direct timer TC0
=> standalone mode functions can be simplified significantly
 2021-01-27 01:10:57 +01:00
tharexde
d53fda3d3d first working version (complete) 2021-01-27 01:03:10 +01:00
tharexde
1ca5d3c53c 4x50 standalone mode 2021-01-25 23:52:14 +01:00
Philippe Teuwen
0fee0c97cb make style 2021-01-23 22:38:07 +01:00
Marcos Del Sol Vives
8bf89436f8 Improve error messages on encrypted nonce acquisition 2021-01-22 16:06:39 +01:00
Marcos Del Sol Vives
7094994b57 Fix nonce acquisition 2021-01-22 16:05:45 +01:00
tharexde
e09d8b27a2 timeout define instead of hardcoded value 2021-01-20 19:29:57 +01:00
tharexde
6b6f104d9a if no carrier clear former authentication 2021-01-20 00:58:48 +01:00
tharexde
a931cea2f6 First fully functional version of 4x50 sim 2021-01-19 00:20:03 +01:00
tharexde
78d1e09595 deleted test functions, clean up 2021-01-18 00:01:22 +01:00
tharexde
473d89342b rearrangements 2021-01-17 23:35:21 +01:00
tharexde
ef56bee76a Merge branch 'master' into sim_half_duplex 
update 210117
 2021-01-17 00:31:38 +01:00
tharexde
03d56596cb clean up 2021-01-17 00:27:08 +01:00
tharexde
cff48f84c6 refactoring 2021-01-16 19:40:42 +01:00
tharexde
c15266dfc2 added timeouts 2021-01-16 01:59:02 +01:00
Philippe Teuwen
694a48b65a text 2021-01-14 14:36:53 +01:00
tharexde
1f08512670 reduced use of timers and synchronized read actions 2021-01-12 00:22:53 +01:00
tharexde
af5237e6fd changes due to desynchronization effects 2021-01-11 21:23:38 +01:00
tharexde
56efcc9d7f half duplex sim status: stop mechanism still missing 2021-01-07 23:49:59 +01:00
tharexde
12071080a6 next step (half duplex simulation): all commands seem to work 2021-01-07 01:22:46 +01:00
tharexde
560be30053 next version of half duplex simulation 2021-01-05 01:12:21 +01:00
tharexde
eea63a6cb7 first draft half duplex simulation 2021-01-03 22:50:27 +01:00
Philippe Teuwen
b956d4c148 hf 14a config cliparser: use string values 2020-12-31 11:39:57 +01:00
tcprst
a9f4f4f804
hf 14a config - now use cliparser 2020-12-30 22:42:46 -05:00
Philippe Teuwen
b0f122528d minor 2020-12-30 01:36:44 +01:00
Philippe Teuwen
a0e110941a make style 2020-12-30 01:31:40 +01:00
tharexde
9b3bc55136 aa 2020-12-29 17:40:18 +01:00
gator96100
bdb384f7b7 Fix for the Makefile.platform file 2020-12-28 22:57:58 +01:00
gator96100
11567dc2e3 Added option for running with uncompressed .data section. Thanks @doegox 2020-12-28 22:48:41 +01:00
tharexde
438cada2cf commits after xcode crash 2020-12-27 22:22:44 +01:00
Philippe Teuwen
8d4acbe3a6 make style 2020-12-23 19:51:10 +01:00
Iceman
efb706a84e
Merge pull request #1120 from iconsec/master 
add dump_sim_mode to Standalone HF_ICECLASS
 2020-12-18 18:14:43 +01:00
Drew
db72949720 change default mode; refactor save to take name 2020-12-18 12:01:03 -05:00
Drew
ba611ffb53 add dump_sim_mode to Standalone HF_ICECLASS 2020-12-18 10:18:58 -05:00
Philippe Teuwen
975034854d rework 14b apdu timeout computations 2020-12-18 02:15:42 +01:00
Philippe Teuwen
204ae46bf7 minor 2020-12-18 02:15:42 +01:00
Philippe Teuwen
ffb1b662ac allowing user timeouts in 14b apdus 2020-12-18 02:15:42 +01:00
tharexde
0be10b617e
Delete lf_tharexde.c 
uploaded by mistake
 2020-12-17 21:09:02 +01:00
tharexde
50eb90bdc7 added missing static statements 2020-12-17 20:55:01 +01:00
tharexde
ced056be19 deleted non existing functions in header 2020-12-17 20:54:06 +01:00
tharexde
c37b74a721 Merge branch 'master' into 4x50_eview 
update 201217
 2020-12-17 20:42:41 +01:00
tharexde
daaa3578ec replaced hardcoded values 2020-12-16 20:44:04 +01:00
Christian Molson
60f36b468d em4x70: Add write key convenience function. Use real values in writekey/auth help text so people with blank tags can program a test key and test authentication. 2020-12-15 12:32:30 -05:00
Christian Molson
dc35f79bd2 em4x70: Add write pin convenience function to write and verify a new pin 2020-12-15 11:22:43 -05:00
Christian Molson
ff762027d9 em4x70: Update receive function with expected bits to receive. 2020-12-15 08:57:11 -05:00
Christian Molson
afbef5ba73 em4x70: clean up check_ack function 2020-12-15 08:34:14 -05:00
Christian Molson
a2c21f1d07 em4x70: fix function names 2020-12-15 08:33:57 -05:00
Christian Molson
f87aa869c6 em4x70: clean up edge detection code 2020-12-15 08:15:18 -05:00
Christian Molson
40654b8ac6 em4x70: Clean up conversion of RF periods to ticks 2020-12-14 19:44:07 -05:00
Christian Molson
334000d444 em4x70: Used fixed threshold for high/low. Since we measure only pulse lengths (high+low) we just need to make sure the value is higher than noise threshold 2020-12-14 16:17:29 -05:00
Christian Molson
701914430f em4x70 makestyle 2020-12-12 10:02:43 -05:00
Christian Molson
13268df9c3 Merge remote-tracking branch 'upstream/master' into em4x70-auth 2020-12-12 10:00:22 -05:00
Christian Molson
a6024a8622 EM4x70 Authentication support 2020-12-12 09:59:30 -05:00
Philippe Teuwen
7cd80611d3 #makestyleday 2020-12-12 14:46:40 +01:00
Christian Molson
ed8c63a4f4 EM4x70 Unlock support. Send pin code to unlock tag. 2020-12-12 01:20:26 -05:00
Christian Molson
4c52fac9e1 EM4x70 write support 2020-12-11 23:26:17 -05:00
Christian Molson
e48d343c5c Fix issue with command parity, adding too many bits to command 2020-12-09 16:22:38 -05:00
Christian Molson
011b585b0d Merge remote-tracking branch 'upstream/master' into em4x70_support 2020-12-09 10:00:42 -05:00
Christian Molson
97a27c0156 Remove debug code 2020-12-09 09:57:17 -05:00
iceman1001
01b2c14616 adapt and fix memoryleaks in Em4x50 2020-12-09 12:18:01 +01:00
tharexde
d63d359c14 fixed initialization (memset instead of memcpy) 2020-12-07 20:31:27 +01:00
Christian Molson
b0ff0ed526 Fix bug with manchester receive function. Using suggested algorithm from em4x70 datasheet 2020-12-07 11:18:00 -05:00
tharexde
0ba4394532 cleanup 2020-12-06 23:08:43 +01:00
tharexde
1a173f69f9 cleanup 2020-12-06 20:13:51 +01:00
tharexde
ce83a1cb5f textual 2020-12-06 12:27:01 +01:00
tharexde
f513582967 removed debug output 2020-12-06 01:58:07 +01:00
tharexde
314450b738 transferring data of dump file to device via 
- em4x50_eload or
	- file option "-f <filename>":
		- via spiffs if flash memory is available
		- via emulator memory if flash memory is not available
 2020-12-06 01:53:43 +01:00
tharexde
d5347ced4e filename in spiffs is now a parameter of em4x50_sim 2020-12-06 01:48:41 +01:00
Christian Molson
614ab55809 Initial commit for em4x70 support. 
Initially I only have an em4x70 variant used for car transponders.
Also known as the ID48.
 2020-12-05 17:47:03 -05:00
tharexde
8fde0ba047 relocated FpgaDownloadAndGo from em4x50_chk to appmain 2020-12-05 23:44:18 +01:00
tharexde
952845722c use piffs instead of direct writing to flash memory 2020-12-04 22:38:48 +01:00
tharexde
e50f386ad2 changed parameter in parameter list of em4x50_chk 2020-12-04 22:37:47 +01:00
tharexde
6876ff2f04 Relocated write requests in function 4x50_restore from device to client 2020-12-03 22:00:52 +01:00
tharexde
d546936f5c Merge branch 'master' into update_4x50 
merge 20120merge 2012033
 2020-12-03 21:17:46 +01:00
tharexde
6448ade0f2 deleted client call of reset function 2020-12-03 20:47:01 +01:00
tharexde
e41e8555a3 restore function now stops if password is wrong 2020-12-03 20:42:46 +01:00
cyberpunk-re
a03d725a7f Comments 2020-12-01 22:56:08 +00:00
cyberpunk-re
d792ff822b Proper identation and CHANGELOG entry 2020-12-01 21:42:22 +00:00
cyberpunk-re
c76836880a Fix iso 15693 sim. Provide basic functionality for reader to detect ID 2020-12-01 21:28:37 +00:00
iceman1001
2613284dfc fix lf search - cotag exiting on deviceside 2020-12-01 17:06:49 +01:00
tharexde
b0b0d4b3f3 Merge branch 'master' into update_4x50 
fixed conflict
 2020-11-30 23:42:39 +01:00
Iceman
1cfc69bd0d
Merge pull request #1079 from cyberpunk-re/MFU_SIM_maxReads 
MFU emulation now supports automatic exit after <num> blocks read.
 2020-11-30 23:14:00 +01:00
tharexde
98fbd89fb5 restored unintentionally deleted parts 2020-11-30 22:28:06 +01:00
tharexde
9d52801259 Merge branch 'master' into update_4x50 
update 201130 2
 2020-11-30 21:18:03 +01:00
cyberpunk-re
5486bdd18c Added 'mf mfu sim t 7 n <numreads>' - MFU emulation now supports automatic exit after <num> blocks read. 2020-11-30 20:07:51 +00:00
iceman1001
1bccb77654 lf hid clone - prepped for EM. Disabled it for viking / hid clone until further testing 2020-11-30 21:06:37 +01:00
tharexde
efd6c04b7e Merge branch 'master' into update_4x50 
update 201130
 2020-11-30 20:38:25 +01:00
tharexde
f03fac540a delated watch function (em4x50) 2020-11-30 00:03:22 +01:00
tharexde
e6eb6af9e3 - replaced return value BUTTON_SINGLE_CLICK by PM3_EOPABORTED 
- changed 4x50_stdread to 4x50_reader
 2020-11-30 00:01:08 +01:00
tharexde
96cceab10a changed 4x50_stdread to 4x50_reader 2020-11-29 23:58:10 +01:00
tharexde
fdd2890272 changed 4x50_stdread to 4x50_reader 2020-11-29 23:57:55 +01:00