Proxmark/proxmark3
1
1
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2024-09-20 23:06:25 +08:00
Code Issues Packages Projects Releases Wiki Activity
2244 commits 3 branches 11 tags 34 MiB
Commit graph

2244 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Iceman 380e0d086c
Merge pull request #553 from Arnie97/master 
Minor fixes
 2018-01-25 09:50:47 +01:00
Arnie97 b5cf8b07e2 mfkeys.lua: Remove trailing whitespaces. 2018-01-25 14:52:30 +08:00
Arnie97 f88fa399bc mfkeys.lua: Align empty cells in the table. 2018-01-25 14:48:12 +08:00
Arnie97 392301aaab mfkeys.lua: Remove the user input helpers (now in lualibs/utils.lua) 2018-01-25 14:46:00 +08:00
Arnie97 4e002980af hf mf ecfill: Add the missing line break. 2018-01-25 14:39:27 +08:00
Arnie97 e98389b355 Fix typo in lua scripts: 1443a -> 14443a. 2018-01-25 13:43:01 +08:00
Iceman fb69dd881a
Merge pull request #551 from pwpiwi/remove_reveng 
Remove reveng
 2018-01-24 10:47:59 +01:00
pwpiwi 757221f5d6 Remove reveng 
(its license was not compatible with PM3 license, see issue #527)
 2018-01-24 08:38:01 +01:00
Iceman 940b282f54
Merge pull request #550 from pwpiwi/fix_warnings 
fix clang compiler warnings
 2018-01-23 17:43:07 +01:00
pwpiwi ec0872181b fix clang compiler warnings 
identified in http://www.proxmark.org/forum/viewtopic.php?id=5388
 2018-01-23 16:55:48 +01:00
Iceman acaa71ffe3
Merge pull request #549 from rkblackfire/master 
Debug&Improvement of HW TUNE
 2018-01-22 19:33:41 +01:00
rkblackfire f3ffd5a24f Revert "dbg: Watchdog resets while 'hw tune lf'" 
This reverts commit fc175230f4.
 2018-01-22 19:25:22 +01:00
rkblackfire 095173f72d chg: print only valid tuning data 
only print the ranges which were tuned, thus not showing an error for
'lf antenna' when called 'hw tune hf' and vice versa
 2018-01-22 18:59:48 +01:00
rkblackfire fc175230f4 dbg: Watchdog resets while 'hw tune lf' 
loop does not finish, u_int is always '>=0'
 2018-01-22 18:54:29 +01:00
Iceman 30bb6d6591
Merge pull request #548 from merlokk/mfsniff_fix 
`hf mf sniff` not a small fix
 2018-01-17 23:16:08 +01:00
merlokk 2ba37081ec added nested authentication "not implemented" warning 2018-01-17 18:16:37 +02:00
Iceman af1940a5d8
Merge pull request #546 from pwpiwi/fix_tune 
hw tune improvements (based on issue #544)
 2018-01-17 16:11:56 +01:00
merlokk a034948363 fix eml file format 2018-01-17 16:12:50 +02:00
merlokk f7887fa82e added magic cards 2018-01-17 16:01:56 +02:00
merlokk 3e77c7a7b4 ignore SELECT ALL 2018-01-17 15:57:24 +02:00
merlokk 543a6ed3c9 SNF_WUPREQ and SNF_SAK harmonized) 2018-01-17 15:48:01 +02:00
merlokk 968cb35498 deleted save UID from card 2018-01-17 14:14:36 +02:00
merlokk 35cc71b075 delete opposite states fix 2018-01-17 14:10:26 +02:00
merlokk 3544b99715 fixed #541 2018-01-16 17:54:54 +02:00
merlokk feb328c90a hf mf sniff small fix 2018-01-16 14:34:04 +02:00
Iceman 138a0e7a6b
Merge pull request #503 from merlokk/travis 
Travis
 2018-01-15 16:06:37 +01:00
pwpiwi d1f9ec06ae
Revert changes in hardnested nonces collection. Sacrifice some speed in favor of stability for some card types (#547) 2018-01-15 15:29:14 +01:00
Oleg Moiseenko 8ec06f5ef3 hf mf sniff: small fixes 2018-01-12 22:37:55 +01:00
Oleg Moiseenko 078e2bd238 fix: SIMD instruction set detection on non-x86 hardware 
should fix issue #542
 2018-01-12 22:04:16 +01:00
pwpiwi d040cb9024 hw tune: 
* scale results to allow higher LF voltages
* remove historic comments
 2018-01-12 21:48:42 +01:00
pwpiwi 9b32625c2c hw tune minor fix, comments updated 2018-01-11 08:32:01 +01:00
Iceman 2d51da38f3 HW TUNE adapting for powerful antennas. (#540) 
CHG:  'hw tune'  adapting LF measuring from ( >> 8) max 65v,  to ( >>9 ) max 130v in the graph data.   Max LF voltage is 140.8v to measure.

Added a delay for antenna coil and caps to power up before measuring,
removed a variable in ReadAdc
 2018-01-10 13:56:27 +01:00
merlokk 84e86ed9e3 move appveyor.yml 2018-01-07 23:23:35 +02:00
Iceman 932af56ea0
Merge pull request #538 from merlokk/hardnestedsetsimd 
hardnested SIMD select
 2018-01-06 18:54:27 +01:00
Iceman 91ca74f0ed
Merge pull request #534 from pwpiwi/fix_printf 
Minor fixes
 2018-01-06 18:54:09 +01:00
merlokk ab0582d672 fix another way 2018-01-06 19:14:34 +02:00
merlokk 4ed45d444b fix #404 2018-01-05 18:36:00 +02:00
merlokk 7421ab0b43 fix readme 2018-01-05 13:04:17 +02:00
merlokk 314a9b9cdd Merge branch 'master' of github.com:Proxmark/proxmark3 into travis 2018-01-05 11:57:11 +02:00
merlokk 58f0ae45c1 move travis files 2018-01-05 11:51:51 +02:00
Iceman 1c313691e6 Update ikeys.c (#537) 
FIX: 'hf iclass'  - sneaky fread bug.   It should return same number of bytes as read if ok.   Thanks to @bettse who found it.
 2018-01-03 11:15:46 +01:00
merlokk 362d203909 works 2018-01-02 22:28:13 +02:00
merlokk eaecd7f541 add print SIMD core at the beginning 2018-01-02 19:11:26 +02:00
merlokk 4a768458d2 hardnested SIMD select 2018-01-02 19:05:12 +02:00
Iceman e1e7a09db1
Merge pull request #533 from merlokk/chktd 
fix #532. looks at length of parameters.
 2017-12-30 15:23:14 +01:00
Michael Farrell 3775e9e865 Allow externalisation of PrintAndLog (#506) 2017-12-28 18:27:39 +01:00
pwpiwi 96be871374 Merge branch 'master' into fix_printf 2017-12-28 18:23:41 +01:00
Pierre Pronchery 3ded0f97d3 Khorben/warnings (#519) 
* Fix warnings and missing #include for <ctype.h>
* Avoid a warning in client/util.c
 2017-12-28 17:56:18 +01:00
merlokk 55b700a0ac fix #532. looks at length of parameters. 2017-12-28 13:29:30 +02:00
pwpiwi b838c4ff27 Minor fixes 
* fix compiler warnings on Ubuntu
* cmdhf14a.c: make manufactureMapping static
* cmdhf14a.c: fix format strings
 2017-12-28 08:49:07 +01:00