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

6369 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Iceman caceea24a4
Update default_keys.dic 2019-07-15 15:36:12 +02:00
Philippe Teuwen 0ea7fa7784 buggy 'mem read' removed, 'mem save' renamed 'mem dump', can now display too 2019-07-15 12:57:20 +02:00
Philippe Teuwen 6a54de1184 changelog 2019-07-15 12:47:42 +02:00
Iceman 23160f20cb
Merge pull request #244 from cjbrigato/patch-1 
HF_COLIN/STANDALONE: FIX Simulation/Writing Tag to flash/Reading back…
 2019-07-15 11:40:24 +02:00
Iceman 7aabab2462
Merge pull request #242 from slurdge/remove_aes_c 
Remove aes.c in favor of mbedtls implementation.
 2019-07-15 09:02:07 +02:00
Philippe Teuwen 2209a0c00d BUSY_TIMEOUT for mem wipe was too short, thanks @cjbrigato 2019-07-15 01:13:11 +02:00
Philippe Teuwen 31c3a15cd4 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 
* 'master' of github.com:RfidResearchGroup/proxmark3:
  textual
  Changelog for PR #245, #246
  chg: 'script run read_pwd_mem' - now can correctly deal with more than 4096 bytes when printing mifare classic keys
  Fix. More flexible anti-collision frame check
  hf_mf_sim. Really tags not respond NACK on invalid authentication
 2019-07-15 00:31:46 +02:00
Philippe Teuwen cad1d500ca add msleep command 2019-07-15 00:31:38 +02:00
Iceman 1fa40fbac9
Merge pull request #247 from McEloff/hf_mf_changelog 
Changelog for PR #245, #246
 2019-07-14 23:05:08 +02:00
Iceman 5d63834512
Merge branch 'master' into hf_mf_changelog 2019-07-14 23:04:56 +02:00
Chris 1f9eb10d15 textual 2019-07-14 23:02:24 +02:00
Eloff 0c3d2cee2b Changelog for PR #245, #246 2019-07-15 00:00:34 +03:00
Chris 859a5e80ce Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-07-14 22:52:50 +02:00
Chris 0a845df8c3 chg: 'script run read_pwd_mem' - now can correctly deal with more than 4096 bytes when printing mifare classic keys 2019-07-14 22:52:34 +02:00
Iceman 9196bdc670
Merge pull request #245 from McEloff/hf_mf_sim_auth_nack 
hf_mf_sim. Really tags not respond NACK on invalid authentication
 2019-07-14 22:48:04 +02:00
Iceman 9af039e2d1
Merge pull request #246 from McEloff/hf_mf_sim_anticol 
Fix. More flexible anti-collision frame check (hf_mf_sim)
 2019-07-14 22:31:25 +02:00
Eloff a28e359095 Fix. More flexible anti-collision frame check 2019-07-14 23:18:07 +03:00
Philippe Teuwen 055efaff88 proxmark.sh: remove leftover var 2019-07-14 22:13:40 +02:00
Eloff f6f7e7a9f6 hf_mf_sim. Really tags not respond NACK on invalid authentication 2019-07-14 23:12:39 +03:00
Philippe Teuwen 383d3327be remove spurious changes in make style 2019-07-14 18:42:11 +02:00
Philippe Teuwen fee9c0ef84 silent uart_close error message as it can be called from uart_open failing modes, e.g. when waiting for port to appear 2019-07-14 18:26:04 +02:00
Philippe Teuwen 82e0568e65 shellcheck bash scripts 2019-07-14 18:20:41 +02:00
Philippe Teuwen d746847d13 proxmark3.sh for WSL: handle case when chmod is needed 2019-07-14 17:58:47 +02:00
Colin J. Brigato 2fc26fbf35
HF_COLIN/STANDALONE: FIX Simulation/Writing Tag to flash/Reading back from flash 
* Simulation was broke by the 4/7/10 UID lenght pseudo-support (which, in regard of the whole, will never be of any use unless complete reimplementaiton). Kept this part as respect, but enforced UID_IN_EMUL, since it will _ALWAYS_ be the case, be it direct simulation after tag breaking or from reading back tag.
* Writing tag was broken when flashmem driver had SPI settings changed, enforcing 48MHz speed as necessity for some work (like in hf_bog), so now it is
* Reading back, however, should absolutely be done at 24Mhz to avoid those unecessary and unstable [On this chip] FAST_READS.

Should worsk flawlessly now.
If one has spare time, handling getting new keys or defining whole Schemes in Flashmem would be perfect. Just has to be a conditional and a 8/16key ordered answer.
 2019-07-14 13:29:40 +02:00
Philippe Teuwen 55602bf833 Fix few zelaous WARNING->ERR 2019-07-14 12:17:34 +02:00
Philippe Teuwen 8bf4b4ad97 Promote WARNING to ERR on some error msgs 2019-07-14 00:35:18 +02:00
Philippe Teuwen bb3c5e364e remove perror 2019-07-14 00:30:57 +02:00
Philippe Teuwen 25e2ab9a4c changelog 2019-07-13 18:29:36 +02:00
Philippe Teuwen 99d33f9479
Merge pull request #243 from McEloff/hf_mf_chk_log 
Does clear trace log only at first call 'hf mf chk', to save process history
 2019-07-13 18:27:44 +02:00
Eloff 735077f358 Does clear trace log only at first call 'hf mf chk', to save whole process history 2019-07-13 18:26:52 +03:00
Philippe Teuwen edcd2b974e wsl: no driver required 2019-07-13 13:05:38 +02:00
Philippe Teuwen b0dbbd3683 make style 2019-07-13 00:38:30 +02:00
Philippe Teuwen ed47ca7186 tuning windows doc 2019-07-13 00:36:10 +02:00
Philippe Teuwen d11684fcab Get proxmark.sh supporting WSL 2019-07-13 00:14:23 +02:00
slurdge 996ed197fb Remove aes.c in favor of mbedtls implementation. 
Changelog
 2019-07-12 23:48:54 +02:00
Philippe Teuwen ec534305de Document WSL and update ProxSpace instructions 2019-07-12 21:47:56 +02:00
Philippe Teuwen cbfd195abf Document compilation options 2019-07-12 01:55:36 +02:00
Philippe Teuwen e51b4f0fdd changelog 2019-07-11 14:08:58 +02:00
Philippe Teuwen fec7d802b9 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 
* 'master' of github.com:RfidResearchGroup/proxmark3:
  Update default_keys.dic with keys from an APK
 2019-07-11 13:54:48 +02:00
Philippe Teuwen 844d732297 Replace ukbhit by kbd_enter_pressed, not requiring tcgetattr: 
Note that it behaves differently now
* it looks for Enter key only, not any key
* it "eats" the input, no need for (void)getchar() after it
* it works the same no matter the value of ICANON
* the mingw version has been adapted to act the similarly

This should fix its usage on Android where tcgetattr always returns -1
 2019-07-11 13:01:34 +02:00
Iceman 11941e0e8f
Merge pull request #238 from 3ldidi94/master 
Update default_keys.dic with keys from an APK
 2019-07-11 11:18:11 +02:00
3ldidi94 6f457873cc
Update default_keys.dic with keys from an APK 
Update the dic with keys from Android application "Scan Badge".
I did the diff between keys already present and keys from the application.
 2019-07-11 10:37:00 +02:00
3ldidi94 0080edfe7f
Merge pull request #1 from RfidResearchGroup/master 
test
 2019-07-11 10:32:48 +02:00
Philippe Teuwen fd5c30f555 jtag tools: add config for RaspberryPi 2019-07-10 22:51:42 +02:00
Philippe Teuwen 1ae85d20d7 jtag tools: add config for FTDI C232HM-DDHSL-0 2019-07-10 22:37:30 +02:00
Philippe Teuwen 4bd15d900b jtag tools: some factorisation 2019-07-10 22:35:29 +02:00
Philippe Teuwen 73bbb2e9e8 Silent properly GCC format-truncation warnings in jansson 2019-07-10 22:32:55 +02:00
Philippe Teuwen e53ac8b715 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 
* 'master' of github.com:RfidResearchGroup/proxmark3:
  Fix compilation under MacOSX
 2019-07-10 21:49:54 +02:00
Philippe Teuwen 99d2ed224a Minor changes on bootloader chip info 2019-07-10 21:49:14 +02:00
slurdge 4727ab96d7 Dynamic report of the chipID for flashing purposes 2019-07-10 21:11:20 +02:00