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

2075 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Iceman 91e03840f4
Merge pull request #531 from pwpiwi/loclass_gpl 
Update loclass license conditions
 2017-12-27 09:41:50 +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 dfdc087bc0
Merge pull request #529 from merlokk/appveyor-tst 
added crypto tests to Appveyor
 2017-12-25 15:13:46 +01:00
merlokk e79209e1f4 fixed condition 2017-12-24 01:11:43 +02:00
merlokk b1c0f02098 added xcode 9.2 and some logging 2017-12-24 00:28:38 +02:00
marshmellow42 69fb283011
Merge pull request #528 from Proxmark/iceman1001-patch-1 
Update cmdmain.c
 2017-12-23 17:17:43 -05:00
merlokk 828279508a inc timeout 2017-12-23 23:59:47 +02:00
merlokk 546ae21fa1 add hf emv test to appveyor config 2017-12-23 23:50:51 +02: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
marshmellow42 69f98ec91e
Merge pull request #526 from Proxmark/marshmellow42-patch-1 
Update lfsampling.c
 2017-12-21 08:02:19 -05:00
Iceman 6469d5503a
Update lfsampling.c 
@marshmellow42 's fix for #514
 2017-12-21 07:55:51 +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
marshmellow42 5421396e7e
Merge pull request #523 from Proxmark/iceman1001-patch-2 
ADD: 'hf iclass chk'
 2017-12-16 11:09:48 -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
Iceman 678a3cb2fe
Update cmdhficlass.h 
add function head
 2017-12-15 15:48:25 +01:00