proxmark3-svn
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.

6 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

6 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

6 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

7 years agoadded xcode 9 and 9.1 coz 8 and 8.1 links to 8.3
merlokk [Sat, 2 Dec 2017 14:41:39 +0000 (16:41 +0200)]
added xcode 9 and 9.1 coz 8 and 8.1 links to 8.3

7 years agoremove show options
merlokk [Sat, 2 Dec 2017 14:24:47 +0000 (16:24 +0200)]
remove show options

7 years agoadd options show
merlokk [Sat, 2 Dec 2017 11:06:51 +0000 (13:06 +0200)]
add options show

7 years agoadded info
merlokk [Sat, 2 Dec 2017 09:51:12 +0000 (11:51 +0200)]
added info

7 years agorename travis file
merlokk [Fri, 1 Dec 2017 16:57:31 +0000 (18:57 +0200)]
rename travis file

7 years agoadded REPOSITORY_EP var
merlokk [Fri, 1 Dec 2017 16:54:54 +0000 (18:54 +0200)]
added REPOSITORY_EP var

7 years agoinit travis from https://github.com/pwpiwi/proxmark3/tree/travis_test
merlokk [Fri, 1 Dec 2017 16:49:31 +0000 (18:49 +0200)]
init travis from https://github.com/pwpiwi/proxmark3/tree/travis_test

7 years agoMerge pull request #502 from merlokk/apduhelp
Iceman [Thu, 30 Nov 2017 19:04:16 +0000 (20:04 +0100)]
Merge pull request #502 from merlokk/apduhelp

added hint on `hf 14a apdu`. close #495

7 years agoadded hint on `hf 14a apdu`. close #495 502/head
merlokk [Thu, 30 Nov 2017 17:34:20 +0000 (19:34 +0200)]
added hint on `hf 14a apdu`. close #495

7 years agoUpdate fpgaloader.c (#500)
Iceman [Thu, 30 Nov 2017 11:46:40 +0000 (12:46 +0100)]
Update fpgaloader.c (#500)

This address part1 in issue https://github.com/Proxmark/proxmark3/issues/499

Device power out 13.56Mhz when started (initialised). This output is not stopped until arbitary command is sent.

7 years agoMerge pull request #488 from pwpiwi/fix_usbpower
Iceman [Tue, 28 Nov 2017 20:26:57 +0000 (21:26 +0100)]
Merge pull request #488 from pwpiwi/fix_usbpower

fix: USB Power requirements

7 years agoChange USB Configuration to "Bus Powered" 488/head
pwpiwi [Tue, 28 Nov 2017 20:22:29 +0000 (21:22 +0100)]
Change USB Configuration to "Bus Powered"

7 years agoMerge pull request #494 from qaisjp/patch-1
Iceman [Sun, 26 Nov 2017 05:15:48 +0000 (06:15 +0100)]
Merge pull request #494 from qaisjp/patch-1

Make README file markdown

7 years agoMake README file markdown 494/head
Qais Patankar [Sun, 26 Nov 2017 04:41:24 +0000 (04:41 +0000)]
Make README file markdown

7 years agooptimization UDOL creation. does not affect on functionality. 493/head
merlokk [Sat, 25 Nov 2017 19:17:56 +0000 (21:17 +0200)]
optimization UDOL creation. does not affect on functionality.

7 years agoAdded `hf emv exec` - command for execute EMV transaction
merlokk [Sat, 25 Nov 2017 12:40:23 +0000 (14:40 +0200)]
Added `hf emv exec` - command for execute EMV transaction
Added to `hf emv exec` MSD path for VISA and Mastercard and some other compatible EMV cards

7 years agomerged emvcore
merlokk [Sat, 25 Nov 2017 12:30:53 +0000 (14:30 +0200)]
merged emvcore

7 years agopart of changes
merlokk [Sat, 25 Nov 2017 10:58:50 +0000 (12:58 +0200)]
part of changes

7 years agoMerge pull request #491 from pwpiwi/mod_select
Iceman [Sat, 25 Nov 2017 08:51:39 +0000 (09:51 +0100)]
Merge pull request #491 from pwpiwi/mod_select

minor iso14443a timing fixes to avoid select errors

7 years agoMerge pull request #486 from KenzyCarey/master
Iceman [Fri, 24 Nov 2017 11:39:45 +0000 (12:39 +0100)]
Merge pull request #486 from KenzyCarey/master

Add brutesim script

7 years agominor iso14443a timing fixes to avoid select errors: 491/head
pwpiwi [Wed, 22 Nov 2017 16:46:00 +0000 (17:46 +0100)]
minor iso14443a timing fixes to avoid select errors:
* take setup frame guard time (SFGT) into account
* adjust iso14a_timeout by FPGA delays
* don't give up on first WUPA. Retry several times

7 years agoAdd: Emv first part of commands
Oleg Moiseenko [Wed, 22 Nov 2017 05:16:33 +0000 (07:16 +0200)]
Add: Emv first part of commands

* hf emv search
* hf emv pse
* hf emv select
* hf emv exec command - only part of functionality

7 years agofix: avoid SspClk overflow due to incomplete reset
pwpiwi [Tue, 21 Nov 2017 06:31:42 +0000 (07:31 +0100)]
fix: avoid SspClk overflow due to incomplete reset

* should fix watchdog reset during hf mf mifare. Thanks @iceman1001 for the hint.

7 years agoAdd files via upload 486/head
Kenzy Carey [Fri, 17 Nov 2017 22:42:52 +0000 (14:42 -0800)]
Add files via upload

7 years agofix: USB Power requirements
pwpiwi [Fri, 17 Nov 2017 08:13:37 +0000 (09:13 +0100)]
fix: USB Power requirements
* correctly indicate the maximum current drawn from the USB bus

7 years agominor fixes
Oleg Moiseenko [Wed, 15 Nov 2017 06:49:18 +0000 (08:49 +0200)]
minor fixes

* fix timeout set in PR #481
* fix warning in util.c printf

7 years agoComplete WTX handling
pwpiwi [Wed, 15 Nov 2017 06:47:18 +0000 (07:47 +0100)]
Complete WTX handling

7 years agoMerge pull request #480 from pwpiwi/fix_nested
marshmellow42 [Mon, 13 Nov 2017 14:42:56 +0000 (09:42 -0500)]
Merge pull request #480 from pwpiwi/fix_nested

fix memory overflow in hf mf nested (issue #479)

7 years agofix memory overflow in hf mf nested (issue #479) 480/head
pwpiwi [Sun, 12 Nov 2017 17:08:57 +0000 (18:08 +0100)]
fix memory overflow in hf mf nested (issue #479)

7 years agoMerge pull request #478 from wsmoses/master
Iceman [Sat, 11 Nov 2017 21:45:37 +0000 (22:45 +0100)]
Merge pull request #478 from wsmoses/master

Fix memory bounds error

7 years agoMerge pull request #477 from merlokk/wtx
Iceman [Sat, 11 Nov 2017 21:16:19 +0000 (22:16 +0100)]
Merge pull request #477 from merlokk/wtx

 Added work with S-Block WTX in 14a apdu on arm side

7 years agoFix memory bounds error 478/head
William S. Moses [Sat, 11 Nov 2017 21:08:57 +0000 (16:08 -0500)]
Fix memory bounds error

7 years agoadded some info from @peterfillmore fork 477/head
merlokk [Sat, 11 Nov 2017 21:05:08 +0000 (23:05 +0200)]
added some info from @peterfillmore fork

7 years agoAdded work with S-Block WTX in 14a apdu on arm side
merlokk [Sat, 11 Nov 2017 20:56:50 +0000 (22:56 +0200)]
Added work with S-Block WTX in 14a apdu on arm side

7 years agoMerge pull request #475 from merlokk/master
Iceman [Fri, 10 Nov 2017 23:39:29 +0000 (00:39 +0100)]
Merge pull request #475 from merlokk/master

true fix #472 )))

7 years agotrue fix #472 ))) 475/head
merlokk [Fri, 10 Nov 2017 23:28:20 +0000 (01:28 +0200)]
true fix #472 )))

7 years agoMerge pull request #474 from merlokk/df_fix
Iceman [Fri, 10 Nov 2017 23:24:38 +0000 (00:24 +0100)]
Merge pull request #474 from merlokk/df_fix

change `ul_switch_off_field` to `DropField` fix #473

7 years agoMerge pull request #471 from marshmellow42/master
Iceman [Fri, 10 Nov 2017 23:24:20 +0000 (00:24 +0100)]
Merge pull request #471 from marshmellow42/master

fix lf search bugs when no tag is on antenna  …

7 years agochange `ul_switch_off_field` to `DropField` fix #473 474/head
merlokk [Fri, 10 Nov 2017 23:19:34 +0000 (01:19 +0200)]
change `ul_switch_off_field` to `DropField` fix #473

7 years agoMerge pull request #472 from merlokk/master
Iceman [Fri, 10 Nov 2017 22:45:45 +0000 (23:45 +0100)]
Merge pull request #472 from merlokk/master

fix #468

7 years agofix #468 472/head
merlokk [Fri, 10 Nov 2017 22:43:29 +0000 (00:43 +0200)]
fix #468

7 years agoMerge pull request #470 from pwpiwi/mod_indent
Iceman [Fri, 10 Nov 2017 22:21:26 +0000 (23:21 +0100)]
Merge pull request #470 from pwpiwi/mod_indent

add: proper indentation when printing TLV objects

7 years agodump only leaf TLV data 470/head
pwpiwi [Fri, 10 Nov 2017 22:09:08 +0000 (23:09 +0100)]
dump only leaf TLV data

7 years agofix incorrect variable name 471/head
marshmellow42 [Fri, 10 Nov 2017 21:03:55 +0000 (16:03 -0500)]
fix incorrect variable name

that is what i get for going back over my code and trying to mimic the
naming style used previously...

7 years agofix lf search bugs when no tag is on antenna
marshmellow42 [Fri, 10 Nov 2017 20:56:52 +0000 (15:56 -0500)]
fix lf search bugs when no tag is on antenna

cotag read could enter endless loop, now cancels if the next bit doesn't
appear

em4x05 detection would loop due to a threshold never being met, now has
a dump out after 1000 samples tested.

fixed some indenting in hitag2 while i was reviewing that code for
potential endless loops...

7 years agoadd: proper indentation when printing TLV objects
pwpiwi [Fri, 10 Nov 2017 20:39:10 +0000 (21:39 +0100)]
add: proper indentation when printing TLV objects

7 years agoMerge pull request #466 from pwpiwi/mod_14areader
Iceman [Fri, 10 Nov 2017 19:53:20 +0000 (20:53 +0100)]
Merge pull request #466 from pwpiwi/mod_14areader

revert field on/off in hf 14a reader, fix typo

7 years agorevert field on/off in hf 14a reader 466/head
pwpiwi [Fri, 10 Nov 2017 19:11:51 +0000 (20:11 +0100)]
revert field on/off in hf 14a reader
fix typo

7 years agoMerge pull request #462 from pwpiwi/fix_hfmfsim
Iceman [Fri, 10 Nov 2017 17:07:25 +0000 (18:07 +0100)]
Merge pull request #462 from pwpiwi/fix_hfmfsim

Fix hf mf sim (issue #412)

7 years agoMerge pull request #461 from merlokk/14a_rework3
Iceman [Fri, 10 Nov 2017 16:14:38 +0000 (17:14 +0100)]
Merge pull request #461 from merlokk/14a_rework3

added `hf 14a apdu` #447 part 3

7 years agomove include modules from h to c file 461/head
merlokk [Fri, 10 Nov 2017 07:15:56 +0000 (09:15 +0200)]
move include modules from h to c file

Impressum, Datenschutz