]> cvs.zerfleddert.de Git - proxmark3-svn/log
proxmark3-svn
6 years agoadd bitbang option to lf cmdread
marshmellow42 [Fri, 9 Feb 2018 20:49:55 +0000 (15:49 -0500)]
add bitbang option to lf cmdread

by setting delay to 0 we can use cmd binary to bitbang the antenna.

note that the timing isn't perfect (especially on the off periods) but
is fairly close. worst i've seen it off is 8us on a large off period.
but i don't have the best test equipment...

6 years agoadd nested auth decoding to `hf mf sniff`
Oleg Moiseenko [Fri, 9 Feb 2018 14:50:55 +0000 (16:50 +0200)]
add nested auth decoding to `hf mf sniff`

6 years agoMerge pull request #569 from pwpiwi/fix_WDT_crash
Iceman [Thu, 8 Feb 2018 18:02:16 +0000 (19:02 +0100)]
Merge pull request #569 from pwpiwi/fix_WDT_crash

fix hf mf mifare (WDT crash)

6 years agohf mf mifare: 569/head
pwpiwi [Thu, 8 Feb 2018 13:50:03 +0000 (14:50 +0100)]
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

6 years agofix: hf mf mifare - populate keylist (#568)
Iceman [Thu, 8 Feb 2018 03:15:42 +0000 (04:15 +0100)]
fix: hf mf mifare -   populate keylist (#568)

This will solve the long running of the attack, since all candidate keys will be tested.

6 years agoMerge pull request #560 from pwpiwi/fix_hfmfmif
Iceman [Tue, 6 Feb 2018 07:15:03 +0000 (08:15 +0100)]
Merge pull request #560 from pwpiwi/fix_hfmfmif

fix: prevent hf mf mifare from always running twice

6 years agofix: prevent hf mf mifare from always running twice 560/head
pwpiwi [Sat, 3 Feb 2018 17:24:32 +0000 (18:24 +0100)]
fix: prevent hf mf mifare from always running twice
(issue #510)

6 years agoMerge pull request #558 from pwpiwi/fix_alignment
Iceman [Thu, 1 Feb 2018 08:49:43 +0000 (09:49 +0100)]
Merge pull request #558 from pwpiwi/fix_alignment

add force_align_arg_pointer attribute to all callback functions

6 years agohf mf nested: use bitwise or instead. (#556)
Arnie97 [Thu, 1 Feb 2018 07:09:14 +0000 (15:09 +0800)]
hf mf nested: use bitwise or instead. (#556)

6 years agoadd force_align_arg_pointer attribute to all callback functions 558/head
pwpiwi [Wed, 31 Jan 2018 17:31:51 +0000 (18:31 +0100)]
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

6 years agoupdate license conditions in armsrc/optimized_cipher.[ch] (#554)
pwpiwi [Wed, 31 Jan 2018 07:14:56 +0000 (08:14 +0100)]
update license conditions in armsrc/optimized_cipher.[ch] (#554)

6 years agoMerge pull request #555 from Arnie97/master
Iceman [Fri, 26 Jan 2018 18:31:23 +0000 (19:31 +0100)]
Merge pull request #555 from Arnie97/master

hf mf nested: transfer keys to the correct block in one sector mode.

6 years agohf mf nested: transfer keys to the correct block in one sector mode. 555/head
Arnie97 [Fri, 26 Jan 2018 17:55:38 +0000 (01:55 +0800)]
hf mf nested: transfer keys to the correct block in one sector mode.

6 years agohf mf eset: reuse mfEmlSetMem().
Arnie97 [Fri, 26 Jan 2018 17:09:56 +0000 (01:09 +0800)]
hf mf eset: reuse mfEmlSetMem().

6 years agoMerge pull request #553 from Arnie97/master
Iceman [Thu, 25 Jan 2018 08:50:47 +0000 (09:50 +0100)]
Merge pull request #553 from Arnie97/master

Minor fixes

6 years agomfkeys.lua: Remove trailing whitespaces. 553/head
Arnie97 [Thu, 25 Jan 2018 06:48:26 +0000 (14:48 +0800)]
mfkeys.lua: Remove trailing whitespaces.

6 years agomfkeys.lua: Align empty cells in the table.
Arnie97 [Thu, 25 Jan 2018 06:48:12 +0000 (14:48 +0800)]
mfkeys.lua: Align empty cells in the table.

6 years agomfkeys.lua: Remove the user input helpers (now in lualibs/utils.lua)
Arnie97 [Thu, 25 Jan 2018 06:10:41 +0000 (14:10 +0800)]
mfkeys.lua: Remove the user input helpers (now in lualibs/utils.lua)

6 years agohf mf ecfill: Add the missing line break.
Arnie97 [Thu, 25 Jan 2018 05:49:40 +0000 (13:49 +0800)]
hf mf ecfill: Add the missing line break.

6 years agoFix typo in lua scripts: 1443a -> 14443a.
Arnie97 [Thu, 25 Jan 2018 05:43:01 +0000 (13:43 +0800)]
Fix typo in lua scripts: 1443a -> 14443a.

6 years agoMerge pull request #551 from pwpiwi/remove_reveng
Iceman [Wed, 24 Jan 2018 09:47:59 +0000 (10:47 +0100)]
Merge pull request #551 from pwpiwi/remove_reveng

Remove reveng

6 years agoRemove reveng 551/head
pwpiwi [Mon, 8 Jan 2018 06:48:13 +0000 (07:48 +0100)]
Remove reveng
(its license was not compatible with PM3 license, see issue #527)

6 years agoMerge pull request #550 from pwpiwi/fix_warnings
Iceman [Tue, 23 Jan 2018 16:43:07 +0000 (17:43 +0100)]
Merge pull request #550 from pwpiwi/fix_warnings

fix clang compiler warnings

6 years agofix clang compiler warnings 550/head
pwpiwi [Tue, 23 Jan 2018 07:27:58 +0000 (08:27 +0100)]
fix clang compiler warnings
identified in http://www.proxmark.org/forum/viewtopic.php?id=5388

6 years agoMerge pull request #549 from rkblackfire/master
Iceman [Mon, 22 Jan 2018 18:33:41 +0000 (19:33 +0100)]
Merge pull request #549 from rkblackfire/master

Debug&Improvement of HW TUNE

6 years agoRevert "dbg: Watchdog resets while 'hw tune lf'" 549/head
rkblackfire [Mon, 22 Jan 2018 18:25:22 +0000 (19:25 +0100)]
Revert "dbg: Watchdog resets while 'hw tune lf'"

This reverts commit fc175230f431e7e33c7628c6b31064d4f7d1e1ad.

6 years agochg: print only valid tuning data
rkblackfire [Mon, 22 Jan 2018 17:59:48 +0000 (18:59 +0100)]
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

6 years agodbg: Watchdog resets while 'hw tune lf'
rkblackfire [Mon, 22 Jan 2018 17:54:29 +0000 (18:54 +0100)]
dbg: Watchdog resets while 'hw tune lf'

loop does not finish, u_int is always '>=0'

6 years agoMerge pull request #548 from merlokk/mfsniff_fix
Iceman [Wed, 17 Jan 2018 22:16:08 +0000 (23:16 +0100)]
Merge pull request #548 from merlokk/mfsniff_fix

`hf mf sniff` not a small fix

6 years agoadded nested authentication "not implemented" warning 548/head
merlokk [Wed, 17 Jan 2018 16:16:37 +0000 (18:16 +0200)]
added nested authentication "not implemented" warning

6 years agoMerge pull request #546 from pwpiwi/fix_tune
Iceman [Wed, 17 Jan 2018 15:11:56 +0000 (16:11 +0100)]
Merge pull request #546 from pwpiwi/fix_tune

hw tune improvements (based on issue #544)

6 years agofix eml file format
merlokk [Wed, 17 Jan 2018 14:12:50 +0000 (16:12 +0200)]
fix eml file format

6 years agoadded magic cards
merlokk [Wed, 17 Jan 2018 14:01:56 +0000 (16:01 +0200)]
added magic cards

6 years agoignore SELECT ALL
merlokk [Wed, 17 Jan 2018 13:57:24 +0000 (15:57 +0200)]
ignore SELECT ALL

6 years agoSNF_WUPREQ and SNF_SAK harmonized)
merlokk [Wed, 17 Jan 2018 13:48:01 +0000 (15:48 +0200)]
SNF_WUPREQ and SNF_SAK  harmonized)

6 years agodeleted save UID from card
merlokk [Wed, 17 Jan 2018 12:14:36 +0000 (14:14 +0200)]
deleted save UID from card

6 years agodelete opposite states fix
merlokk [Wed, 17 Jan 2018 12:10:26 +0000 (14:10 +0200)]
delete opposite states fix

6 years agofixed #541
merlokk [Tue, 16 Jan 2018 15:54:54 +0000 (17:54 +0200)]
fixed #541

6 years ago`hf mf sniff` small fix
merlokk [Tue, 16 Jan 2018 12:34:04 +0000 (14:34 +0200)]
`hf mf sniff` small fix

6 years agoMerge pull request #503 from merlokk/travis
Iceman [Mon, 15 Jan 2018 15:06:37 +0000 (16:06 +0100)]
Merge pull request #503 from merlokk/travis

Travis

6 years agoRevert changes in hardnested nonces collection. Sacrifice some speed in favor of...
pwpiwi [Mon, 15 Jan 2018 14:29:14 +0000 (15:29 +0100)]
Revert changes in hardnested nonces collection. Sacrifice some speed in favor of stability for some card types (#547)

6 years agohf mf sniff: small fixes
Oleg Moiseenko [Fri, 12 Jan 2018 21:37:55 +0000 (23:37 +0200)]
hf mf sniff: small fixes

6 years agofix: SIMD instruction set detection on non-x86 hardware
Oleg Moiseenko [Fri, 12 Jan 2018 21:04:16 +0000 (23:04 +0200)]
fix: SIMD instruction set detection on non-x86 hardware

should fix issue #542

6 years agohw tune: 546/head
pwpiwi [Fri, 12 Jan 2018 20:48:42 +0000 (21:48 +0100)]
hw tune:
* scale results to allow higher LF voltages
* remove historic comments

6 years agohw tune minor fix, comments updated
pwpiwi [Thu, 11 Jan 2018 07:32:01 +0000 (08:32 +0100)]
hw tune minor fix, comments updated

6 years agoHW TUNE adapting for powerful antennas. (#540)
Iceman [Wed, 10 Jan 2018 12:56:27 +0000 (13:56 +0100)]
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

6 years agomove appveyor.yml 503/head
merlokk [Sun, 7 Jan 2018 21:23:35 +0000 (23:23 +0200)]
move appveyor.yml

6 years agoMerge pull request #538 from merlokk/hardnestedsetsimd
Iceman [Sat, 6 Jan 2018 17:54:27 +0000 (18:54 +0100)]
Merge pull request #538 from merlokk/hardnestedsetsimd

hardnested SIMD select

6 years agoMerge pull request #534 from pwpiwi/fix_printf
Iceman [Sat, 6 Jan 2018 17:54:09 +0000 (18:54 +0100)]
Merge pull request #534 from pwpiwi/fix_printf

Minor fixes

6 years agofix another way 538/head
merlokk [Sat, 6 Jan 2018 17:14:34 +0000 (19:14 +0200)]
fix another way

6 years agofix #404
merlokk [Fri, 5 Jan 2018 16:36:00 +0000 (18:36 +0200)]
fix #404

6 years agofix readme
merlokk [Fri, 5 Jan 2018 11:04:17 +0000 (13:04 +0200)]
fix readme

6 years agoMerge branch 'master' of github.com:Proxmark/proxmark3 into travis
merlokk [Fri, 5 Jan 2018 09:57:11 +0000 (11:57 +0200)]
Merge branch 'master' of github.com:Proxmark/proxmark3 into travis

6 years agomove travis files
merlokk [Fri, 5 Jan 2018 09:51:51 +0000 (11:51 +0200)]
move travis files

6 years agoUpdate ikeys.c (#537)
Iceman [Wed, 3 Jan 2018 10:15:46 +0000 (11:15 +0100)]
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.

6 years agoworks
merlokk [Tue, 2 Jan 2018 20:28:13 +0000 (22:28 +0200)]
works

6 years agoadd print SIMD core at the beginning
merlokk [Tue, 2 Jan 2018 17:11:26 +0000 (19:11 +0200)]
add print SIMD core at the beginning

6 years agohardnested SIMD select
merlokk [Tue, 2 Jan 2018 17:05:12 +0000 (19:05 +0200)]
hardnested SIMD select

6 years agoMerge pull request #533 from merlokk/chktd
Iceman [Sat, 30 Dec 2017 14:23:14 +0000 (15:23 +0100)]
Merge pull request #533 from merlokk/chktd

fix #532. looks at length of parameters.

6 years agoAllow externalisation of PrintAndLog (#506)
Michael Farrell [Thu, 28 Dec 2017 17:27:39 +0000 (03:27 +1000)]
Allow externalisation of PrintAndLog (#506)

6 years agoMerge branch 'master' into fix_printf 534/head
pwpiwi [Thu, 28 Dec 2017 17:23:41 +0000 (18:23 +0100)]
Merge branch 'master' into fix_printf

6 years agoKhorben/warnings (#519)
Pierre Pronchery [Thu, 28 Dec 2017 16:56:18 +0000 (17:56 +0100)]
Khorben/warnings (#519)

* Fix warnings and missing #include for <ctype.h>
* Avoid a warning in client/util.c

6 years agofix #532. looks at length of parameters. 533/head
merlokk [Thu, 28 Dec 2017 11:29:30 +0000 (13:29 +0200)]
fix #532. looks at length of parameters.

6 years agoMinor fixes
pwpiwi [Thu, 28 Dec 2017 07:49:07 +0000 (08:49 +0100)]
Minor fixes
* fix compiler warnings on Ubuntu
* cmdhf14a.c: make manufactureMapping static
* cmdhf14a.c: fix format strings

6 years agoAvoid a crash in "script list" (#521)
Pierre Pronchery [Thu, 28 Dec 2017 07:37:09 +0000 (08:37 +0100)]
Avoid a crash in "script list" (#521)

This command crashes if the path to the executable directory could not
be found.

7 years agoMerge pull request #531 from pwpiwi/loclass_gpl
Iceman [Wed, 27 Dec 2017 08:41:50 +0000 (09:41 +0100)]
Merge pull request #531 from pwpiwi/loclass_gpl

Update loclass license conditions

7 years agoChange copyright to allow GPLV3, for https://github.com/Proxmark/proxmark3/issues/527 531/head
Martin Holst Swende [Tue, 26 Dec 2017 19:42:44 +0000 (20:42 +0100)]
Change copyright to allow GPLV3, for https://github.com/Proxmark/proxmark3/issues/527

7 years agoMerge pull request #529 from merlokk/appveyor-tst
Iceman [Mon, 25 Dec 2017 14:13:46 +0000 (15:13 +0100)]
Merge pull request #529 from merlokk/appveyor-tst

added crypto tests to Appveyor

7 years agofixed condition 529/head
merlokk [Sat, 23 Dec 2017 23:11:43 +0000 (01:11 +0200)]
fixed condition

7 years agoadded xcode 9.2 and some logging
merlokk [Sat, 23 Dec 2017 22:28:38 +0000 (00:28 +0200)]
added xcode 9.2 and some logging

7 years agoMerge pull request #528 from Proxmark/iceman1001-patch-1
marshmellow42 [Sat, 23 Dec 2017 22:17:43 +0000 (17:17 -0500)]
Merge pull request #528 from Proxmark/iceman1001-patch-1

Update cmdmain.c

7 years agoinc timeout
merlokk [Sat, 23 Dec 2017 21:59:47 +0000 (23:59 +0200)]
inc timeout

7 years agoadd `hf emv test` to appveyor config
merlokk [Sat, 23 Dec 2017 21:50:51 +0000 (23:50 +0200)]
add `hf emv test` to appveyor config

7 years agoUpdate cmdmain.c 528/head
Iceman [Sat, 23 Dec 2017 21:14:04 +0000 (22:14 +0100)]
Update cmdmain.c

cherry picking at fix for LF SNOOP,

7 years agoEmv4 - more additions to hf emv exec
Oleg Moiseenko [Sat, 23 Dec 2017 15:46:43 +0000 (17:46 +0200)]
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

7 years agoMerge pull request #526 from Proxmark/marshmellow42-patch-1
marshmellow42 [Thu, 21 Dec 2017 13:02:19 +0000 (08:02 -0500)]
Merge pull request #526 from Proxmark/marshmellow42-patch-1

Update lfsampling.c

7 years agoUpdate lfsampling.c marshmellow42-patch-1 526/head
Iceman [Thu, 21 Dec 2017 06:55:51 +0000 (07:55 +0100)]
Update lfsampling.c

@marshmellow42 's fix for #514

7 years ago'hf iclass chk' part3 (#525)
Iceman [Sun, 17 Dec 2017 11:53:21 +0000 (12:53 +0100)]
'hf iclass chk' part3 (#525)

added the options
E -   target elite keys
R -  interpret dictionary keys as raw (already diversified keys)

7 years agoMerge pull request #524 from Proxmark/iceman1001-patch-1
marshmellow42 [Sat, 16 Dec 2017 16:10:05 +0000 (11:10 -0500)]
Merge pull request #524 from Proxmark/iceman1001-patch-1

ADD 'hf iclass chk'  -  part2

7 years agoMerge pull request #523 from Proxmark/iceman1001-patch-2
marshmellow42 [Sat, 16 Dec 2017 16:09:48 +0000 (11:09 -0500)]
Merge pull request #523 from Proxmark/iceman1001-patch-2

ADD: 'hf iclass chk'

7 years agoUpdate cmdhficlass.h 524/head
Iceman [Sat, 16 Dec 2017 16:08:45 +0000 (17:08 +0100)]
Update cmdhficlass.h

...hm..  cut'nd'paste error...

7 years agoUpdate cmdhficlass.c 523/head
Iceman [Fri, 15 Dec 2017 14:53:58 +0000 (15:53 +0100)]
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

7 years agoUpdate cmdhficlass.h
Iceman [Fri, 15 Dec 2017 14:48:25 +0000 (15:48 +0100)]
Update cmdhficlass.h

add function head

7 years agoMerge pull request #515 from pwpiwi/fix_14atimeout
Iceman [Tue, 12 Dec 2017 14:50:53 +0000 (15:50 +0100)]
Merge pull request #515 from pwpiwi/fix_14atimeout

fix: hf mf hardnested failed with new WUPA timing

7 years agofix iso14a_set_timeout() adjustment 515/head
pwpiwi [Mon, 11 Dec 2017 19:40:09 +0000 (20:40 +0100)]
fix iso14a_set_timeout() adjustment

7 years agofix: hf mf hardnested failed with new WUPA timing
pwpiwi [Sun, 10 Dec 2017 10:57:15 +0000 (11:57 +0100)]
fix: hf mf hardnested failed with new WUPA timing
* allow additional 2 ssp_frame cycles to detect SOF
* use only respective functions to get/set iso14a_timeout
* remove waiting time in MifareAcquireEncryptedNonces(). This is covered by GetATQA() now.

7 years agoMerge pull request #511 from ikarus23/typo
Iceman [Wed, 6 Dec 2017 23:00:10 +0000 (00:00 +0100)]
Merge pull request #511 from ikarus23/typo

fix: usage and sample text of hf mf cwipe

7 years agofix: usage and sample text of hf mf cwipe 511/head
ikarus [Wed, 6 Dec 2017 22:30:27 +0000 (23:30 +0100)]
fix: usage and sample text of hf mf cwipe

7 years agoMerge pull request #508 from pwpiwi/fix_AVX512
Iceman [Wed, 6 Dec 2017 16:26:49 +0000 (17:26 +0100)]
Merge pull request #508 from pwpiwi/fix_AVX512

fixing the fix: older shells don't know about &>

7 years agofixing the fix: older shells don't know about &> 508/head
pwpiwi [Wed, 6 Dec 2017 08:25:10 +0000 (09:25 +0100)]
fixing the fix: older shells don't know about &>

7 years agoMerge pull request #507 from pwpiwi/fix_AVX512
Iceman [Tue, 5 Dec 2017 16:26:20 +0000 (17:26 +0100)]
Merge pull request #507 from pwpiwi/fix_AVX512

fix: AVX512 detection

7 years agoMerge pull request #504 from merlokk/emv3
Iceman [Tue, 5 Dec 2017 14:39:37 +0000 (15:39 +0100)]
Merge pull request #504 from merlokk/emv3

EMV3. hf emv exec 2nd part

7 years agofix: AVX512 detection 507/head
pwpiwi [Tue, 5 Dec 2017 07:25:10 +0000 (08:25 +0100)]
fix: AVX512 detection

7 years agosmall refactoring 504/head
merlokk [Mon, 4 Dec 2017 20:20:29 +0000 (22:20 +0200)]
small refactoring

7 years agoadded 9f0a tag
merlokk [Sun, 3 Dec 2017 18:36:04 +0000 (20:36 +0200)]
added 9f0a tag

7 years agoadded a tag
merlokk [Sun, 3 Dec 2017 18:28:36 +0000 (20:28 +0200)]
added a tag

7 years agoget rid of tabs)
merlokk [Sat, 2 Dec 2017 20:12:41 +0000 (22:12 +0200)]
get rid of tabs)

7 years agoadded if
merlokk [Sat, 2 Dec 2017 20:10:25 +0000 (22:10 +0200)]
added if

7 years agotransactions MSD and M/Chip, qVSDC works
merlokk [Sat, 2 Dec 2017 19:47:30 +0000 (21:47 +0200)]
transactions MSD and M/Chip, qVSDC works

7 years agoMerge pull request #493 from merlokk/emv2
Iceman [Sat, 2 Dec 2017 17:39:14 +0000 (18:39 +0100)]
Merge pull request #493 from merlokk/emv2

Emv2. next part of EMV work

Impressum, Datenschutz