Commit graph

1229 commits

Author SHA1 Message Date
marshmellow42
779d9a0e90 reconfigure lf cmdread ...
to use lf config settings instead of it's own settings.  (now allows
full options of lf config...)

also it will now run `data samples` when the command completes making it
not necessary to run manually...

note: adjusted client wait message as it was confusing.
2018-02-10 17:30:32 -05:00
Oleg Moiseenko
a37725facf add nested auth decoding to hf mf sniff 2018-02-09 15:50:55 +01:00
pwpiwi
664e132f88 hf mf mifare:
* prevent WDT crash on repeated tries
* comes with faster execution as side effect
* use uint8_t instead of byte_t
* populate ar instead of (correctly) assuming that it is zero
* remove the "will take a few seconds longer" message because it is no longer true
2018-02-08 14:51:24 +01:00
Iceman
02515642bc fix: hf mf mifare - populate keylist (#568)
This will solve the long running of the attack, since all candidate keys will be tested.
2018-02-08 04:15:42 +01:00
Iceman
2ef3a5e99c
Merge pull request #560 from pwpiwi/fix_hfmfmif
fix: prevent hf mf mifare from always running twice
2018-02-06 08:15:03 +01:00
pwpiwi
d86ee73da5 fix: prevent hf mf mifare from always running twice
(issue #510)
2018-02-03 18:26:09 +01:00
Iceman
c839fa2c25
Merge pull request #558 from pwpiwi/fix_alignment
add force_align_arg_pointer attribute to all callback functions
2018-02-01 09:49:43 +01:00
Arnie97
32e6891a05 hf mf nested: use bitwise or instead. (#556) 2018-02-01 08:09:14 +01:00
pwpiwi
f921c113c9 add force_align_arg_pointer attribute to all callback functions
* inspired by issue #404 and respective fix PR #538
* possible fix for mysterious crashes, e.g. issue #497 and http://www.proxmark.org/forum/viewtopic.php?id=5388
2018-01-31 18:31:51 +01:00
Arnie97
7b7416bd3b hf mf nested: transfer keys to the correct block in one sector mode. 2018-01-27 01:55:38 +08:00
Arnie97
36545f0a56 hf mf eset: reuse mfEmlSetMem(). 2018-01-27 01:09:56 +08: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
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
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
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
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
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
Pierre Pronchery
0f112d6f19 Avoid a crash in "script list" (#521)
This command crashes if the path to the executable directory could not
be found.
2017-12-28 08:37:09 +01:00
Martin Holst Swende
26f202e22f Change copyright to allow GPLV3, for https://github.com/Proxmark/proxmark3/issues/527 2017-12-27 08:44:27 +01:00
Iceman
097d265091
Update cmdmain.c
cherry picking at fix for LF SNOOP,
2017-12-23 22:14:04 +01:00
Oleg Moiseenko
d03fb293bc Emv4 - more additions to hf emv exec
* added rsa polarssl and changed sha1 location to polarssl dir
* deleted old sha1
* added emv-tools pk files
* added polarrssl wrapper sketch to emv_tols
* added test command
* added crypto polarssl with sda test
* added crypto tests and crypto_polarssl sha logic
* added SDA,DDA,fDDA,CDA
2017-12-23 16:46:43 +01:00
Iceman
5e4932e846 'hf iclass chk' part3 (#525)
added the options 
E -   target elite keys
R -  interpret dictionary keys as raw (already diversified keys)
2017-12-17 12:53:21 +01:00
marshmellow42
afb4408b00
Merge pull request #524 from Proxmark/iceman1001-patch-1
ADD 'hf iclass chk'  -  part2
2017-12-16 11:10:05 -05:00
Iceman
909c40c835
Update cmdhficlass.h
...hm..  cut'nd'paste error...
2017-12-16 17:08:45 +01:00
Iceman
385c1a5ebc
Update cmdhficlass.c
ADD: 'hf iclass chk'  - new command to check for keys from a dictionary file. 

hf iclass chk h
hf iclass chk f default_iclass_keys.dic
2017-12-15 15:53:58 +01:00