RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-09-21 15:56:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
16454 commits 3 branches 14 tags 86 MiB
Commit graph

16454 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Boris Fersing 5d4fe5b8df - Mark the credentials as decrypted when decrypting a dump 
- In the view command, show the credentials if the input dump is decrypted
 2023-02-17 10:18:00 -05:00
iceman1001 bfd2fc2a56 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2023-02-14 21:17:36 +01:00
iceman1001 e8d448e6d0 text 2023-02-14 21:17:19 +01:00
iceman1001 736d24cdab increased the readline package to 8.2 2023-02-14 21:16:38 +01:00
Iceman 76f0bb068d
Merge pull request #1912 from jmichelp/master 
Allow current directory to import python libraries
 2023-02-14 07:34:17 +01:00
Jean-Michel Picod 5a2c6406d8 Allow current directory to import python libraries 
also fixed a bunch of wrong comments.
 2023-02-13 21:58:34 +01:00
iceman1001 3ee7ac3254 style 2023-02-11 11:53:20 +01:00
iceman1001 8f977ef989 fix #1909 intendation breaks the makefile 2023-02-11 11:43:29 +01:00
iceman1001 08d2c2f1a5 style 2023-02-11 11:42:58 +01:00
Iceman 881783585b
Merge pull request #1907 from natesales/iceclass-read-sim 
feat: add standalone ICECLASS read/sim mode
 2023-02-11 11:27:49 +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
Iceman 6df86578c7
Merge pull request #1908 from lnv42/master 
fix infinity loop in SpinDelayUs() and SpinDelayUsPrecision()
 2023-02-10 20:53:24 +01: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
Iceman 3d5278f90e
Merge pull request #1906 from natesales/hficlass-encode-verbose 
Add -v verbose flag to "hf iclass encode"
 2023-02-10 06:59:41 +01:00
Nate Sales 75403452de
Merge branch 'master' into iceclass-read-sim 
Signed-off-by: Nate Sales <nate@natesales.net>
 2023-02-09 17:19:01 -05:00
Nate Sales 66f227df9f
Merge branch 'master' into hficlass-encode-verbose 
Signed-off-by: Nate Sales <nate@natesales.net>
 2023-02-09 17:18:31 -05:00
Iceman db6243790e
Merge pull request #1903 from henrygab/option_1902 
Fix Makefile regression from #1894
 2023-02-09 21:11:49 +01:00
Iceman ae57c3b885
Merge pull request #1905 from ah01/waveshare-epaper-new-uid 
Add new UID of Waveshare 1.54" NFC ePaper
 2023-02-09 21:10:38 +01:00
Henry Gabryjelski 55f85a82c9 Add changelog 2023-02-08 23:01:50 -08:00
Nate Sales 5133d4a512 feat: add -v verbose flag to "hf iclass encode" 2023-02-08 20:49:49 -05:00
Nate Sales b1fb181f71 feat: add standalone ICECLASS read/sim mode 2023-02-08 20:31:40 -05:00
ah01 b0dcfdf2c5 Add new UID of Waveshare 1.54" NFC ePaper (probably new HW revision) 2023-02-09 01:22:04 +01:00
iceman1001 cb6f3f381d text 2023-02-08 23:17:19 +01:00
Henry Gabryjelski c6b6f2b6a7 Option for PR 1902 2023-02-07 19:20:42 -08:00
iceman1001 f9dbf1e34d added suggestion how to generate 256kb image in sample file 2023-02-06 21:44:31 +01:00
Iceman a074c4124a
Merge pull request #1894 from henrygab/wsl2_docs 
Enable use under WSL2 w/Kali Linux distribution
 2023-02-05 21:16:35 +01:00
Iceman 01d30e14fc
Merge branch 'master' into wsl2_docs 
Signed-off-by: Iceman <iceman@iuse.se>
 2023-02-05 21:15:57 +01:00
Iceman 6f2bc12d59
Merge pull request #1899 from wh201906/clear 
Add a option to clear the scrollback buffer
 2023-02-05 11:38:20 +01:00
Self Not Found e139c137f9
Add CHANGELOG entry 2023-02-05 17:47:55 +08:00
Self Not Found a7bc082d2d
Add a option to clear the scrollback buffer 2023-02-05 17:37:13 +08:00
Iceman 27d9be7613
Merge pull request #1897 from socram8888/fix-pm3-p 
Fix pm3-flash-all -p XXX
 2023-02-03 22:05:46 +01:00
Marcos Del Sol Vives ab9dab3294
Fix pm3-flash-all -p XXX 2023-02-03 14:41:23 +01:00
U-CHRIS-PC\Chris 3ec3730183 Added XOR extraction and flag to Guardall G-Prox II 2023-02-02 15:53:52 -07:00
iceman1001 23a3590bba unify the text comments 2023-02-02 21:24:34 +01:00
Iceman 61c08a5848
Merge pull request #1895 from adite/master 
Fix broken 'lf em 4x70 brute' command
 2023-02-01 20:25:40 +01:00
adite 5bd8bd13dc Add changelog entry 2023-02-01 19:33:52 +01: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
Henry Gabryjelski 99f24b23b8 fix copy/paste error 2023-01-31 10:01:54 -08:00
Henry Gabryjelski 1a214b389c changelog 2023-01-31 10:01:54 -08:00
Henry Gabryjelski bfc3a53ea2 Modify Makefile to copy group-specific udev rules 2023-01-31 10:00:36 -08:00
Henry Gabryjelski 032f304bf9 Enable use under WSL2 w/Kali Linux distribution 
* Assign group ownership and permissions in udev rules
* Add documentation on WSL2 installation and use
 2023-01-31 10:00:36 -08:00
Iceman abc0c2c676
Merge pull request #1893 from jmichelp/master 
Fix minor bugs in `hf tesla info`
 2023-01-30 23:35:42 +01:00
Jean-Michel Picod 8be70ea560 Fix minor bugs in hf tesla info 2023-01-30 23:27:17 +01:00
Iceman 6856cf54a8
Merge pull request #1880 from wh201906/fix_lf_bps 
Fix the lf sampling when bits_per_sample is less than 8
 2023-01-30 20:24:23 +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 6f6e1adae3
Merge pull request #1889 from adite/master 
Add 'lf em 4x70 brute' command
 2023-01-30 20:18:48 +01:00
Iceman 5a4338941d
Merge branch 'master' into master 
Signed-off-by: Iceman <iceman@iuse.se>
 2023-01-30 20:18:19 +01:00