RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-11-15 22:29:52 +08:00
Code Issues Projects Releases Packages Wiki Activity
4230 commits 3 branches 14 tags 87 MiB
Commit graph

4230 commits

This branch
This branch
All branches
Author SHA1 Message Date
RFID Research Group
41ca388edc
Merge pull request #20 from TomHarkness/master 
OS X - Fix for install.sh
 2018-08-30 20:23:23 +02:00
TomHarkness
761dd9d0e0 OS X - Fix for install.sh 2018-08-30 18:04:07 +10:00
Chris
f1d0e9db4d fix: revert back 2018-08-29 19:42:46 +02:00
Chris
42e883f67b FIX: print_result - now prints correct len. 
FIX: DOWNLOAD_BUFFER -  now with correct result logic
 2018-08-28 21:15:28 +02:00
Chris
637f56b97a update 2018-08-26 09:20:52 +02:00
Chris
1536f8fe24 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2018-08-26 08:21:13 +02:00
Chris
ca5b476730 FIX: 'standanlonemode colin' - mifare1ksim called with correct params (@cjbrigato) 2018-08-26 08:19:59 +02:00
Chris
2eab02e3ba CHG: 'standalone mode MattyRun' - added some comments and suggestion 2018-08-25 23:26:04 +02:00
RFID Research Group
f39cc5b130
Merge pull request #17 from gkelly/fchk-keys 
Populate emulator keys from `hf mf fchk`
 2018-08-23 20:12:31 +02:00
Garret Kelly
a665e170cd Populate emulator keys from hf mf fchk 
Just like `hf mf chk`, when the 't' option is provided make fchk put the
found keys into emulator memory.
 2018-08-23 14:07:48 -04:00
Chris
4edcd908a7 FIX: ntag215 is 7.. Thanks @axfla for pointing it out. 2018-08-22 22:36:41 +02:00
Chris
af89c35e43 CHG: 'hw tune' - bigger array 2018-08-19 21:19:58 +02:00
Chris
24598694e8 CHG: 'hw tune' - bigger array 2018-08-19 21:19:11 +02:00
Chris
b837eb0089 CHG: 'hw tune' - colors 2018-08-19 21:17:46 +02:00
Chris
854bfc8595 FIX: two coverty scan bugs. 2018-08-18 15:22:59 +02:00
Chris
c48d1640c7 removing the canberra lib from default installing. 2018-08-18 12:54:45 +02:00
Chris
206ea46483 update text 2018-08-18 12:12:28 +02:00
Chris
583d8281f3 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2018-08-18 12:06:26 +02:00
RFID Research Group
7048fe3f6f
Merge pull request #16 from TomHarkness/master 
Added some keys
 2018-08-18 11:46:07 +02:00
TomHarkness
81cbce9f6f Added some keys 2018-08-18 12:10:28 +10:00
RFID Research Group
c50adfdf78
Merge pull request #13 from joanbono/master 
Modified install.sh
 2018-08-17 17:12:42 +02:00
jbono
8c30f5d259 Updated Changelog 2018-08-17 11:32:58 +02:00
jbono
f226581654 Improved install.sh to work in Ubuntu 18.04 and using max processors availables for compiling with make 2018-08-17 11:30:45 +02:00
RFID Research Group
f28bd282bb
Merge pull request #11 from reidrankin/patch-2 
Add libcanberra-gtk-module to install.sh
 2018-08-17 08:40:12 +02:00
RFID Research Group
6c6808ab56
Merge pull request #10 from reidrankin/patch-1 
Fix typo in proxmark3.sh
 2018-08-16 19:34:53 +02:00
Reid Rankin
55c4fb2552
Add libcanberra-gtk-module to install.sh 
Under Ubuntu 18.04, the proxmark3 client throws an error that the canberra-gtk-module is missing; this makes that message go away.
 2018-08-16 12:37:29 -04:00
Reid Rankin
927711bdb3
Fix typo in proxmark3.sh 2018-08-16 12:31:12 -04:00
Chris
5bce7d6e7f Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2018-08-16 16:49:30 +02:00
RFID Research Group
7bda1490cd
Delete iceman.txt 
only there for easy detection of which repo this is...
 2018-08-16 16:48:57 +02:00
Chris
75c8bc0f69 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2018-08-16 16:47:54 +02:00
RFID Research Group
0cb2dc44a1
Merge pull request #9 from TomHarkness/master 
fix missing text in proxmark.sh
 2018-08-16 16:47:23 +02:00
TomHarkness
bf5d618390 fix missing test in proxmark.sh 2018-08-17 00:41:42 +10:00
Chris
c7f5ac95d8 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2018-08-16 16:31:40 +02:00
RFID Research Group
ebbc49efde
Merge pull request #7 from TomHarkness/master 
Updated update.sh - by joanbono from iceman1001/proxmark3
 2018-08-16 16:31:01 +02:00
TomHarkness
4229f7a1de Added 'proxmark.sh' from joanbono and entry in changelog 2018-08-17 00:22:54 +10:00
TomHarkness
8e1e34e66f Updated install.sh to detect OS and created a function that installs properly for OS X 2018-08-16 23:53:09 +10:00
TomHarkness
cbe74d8400 Updated update.sh from iceman1001/proxmark3 - by joanbono 2018-08-16 21:47:02 +10:00
Chris
fe332a1f2b removed unneeded ramfunc attribute 2018-08-13 23:50:17 +02:00
Chris
91dea8d694 code clean. 2018-08-13 23:49:33 +02:00
RFID Research Group
39c4548bf3
Merge pull request #2 from iceman1001/patch-1 
Update README.md
 2018-08-13 22:48:24 +02:00
Iceman
afaa20b90a
Update README.md 2018-08-13 22:41:27 +02:00
Chris
8c0aa0c86d FIX: 'hf mf chk' - chkkeys param error fix #1 2018-08-13 22:37:44 +02:00
Chris
4123f09602 update 2018-08-13 13:58:06 +02:00
Chris
cfbd67d082 Fix: 'hf emv' - some cards need to have Le=0x00, some need to not to have... (@merlokk) 2018-08-13 13:56:48 +02:00
Chris
5f77121694 initial commit to be in sync the-soon-defunct repo pm3rdv40. 2018-08-12 21:54:31 +02:00
Iceman
905df58cc3
Merge pull request #227 from drandreas/development 
Clean Legic Reader
 2018-08-12 13:58:25 +02:00
Andreas Dröscher
9ba20b590a change: reduced demodulator to bare minimum 
The initial code added complexity without improving reading distance.
Thankfully the peak detection signal path has a low noise floor.
 2018-08-12 12:51:45 +02:00
Andreas Dröscher
0d0b651246 change: re-added trace log 2018-08-12 12:51:45 +02:00
Andreas Dröscher
ff5b046903 change: re-added status LEDs 
- LED_A: FPGA and 13.56MHz carrier is active
- LED_B: Reading Byte
- LED_C: Writing Byte
 2018-08-12 12:41:45 +02:00
Andreas Dröscher
e052fbc433 change: re-added legic write support 2018-08-12 12:41:45 +02:00