]>
git.zerfleddert.de Git - proxmark3-svn/log
Arnie97 [Thu, 1 Feb 2018 07:09:14 +0000 (15:09 +0800)]
hf mf nested: use bitwise or instead. (#556)
pwpiwi [Wed, 31 Jan 2018 07:14:56 +0000 (08:14 +0100)]
update license conditions in armsrc/optimized_cipher.[ch] (#554)
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.
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.
Arnie97 [Fri, 26 Jan 2018 17:09:56 +0000 (01:09 +0800)]
hf mf eset: reuse mfEmlSetMem().
Iceman [Thu, 25 Jan 2018 08:50:47 +0000 (09:50 +0100)]
Merge pull request #553 from Arnie97/master
Minor fixes
Arnie97 [Thu, 25 Jan 2018 06:48:26 +0000 (14:48 +0800)]
mfkeys.lua: Remove trailing whitespaces.
Arnie97 [Thu, 25 Jan 2018 06:48:12 +0000 (14:48 +0800)]
mfkeys.lua: Align empty cells in the table.
Arnie97 [Thu, 25 Jan 2018 06:10:41 +0000 (14:10 +0800)]
mfkeys.lua: Remove the user input helpers (now in lualibs/utils.lua)
Arnie97 [Thu, 25 Jan 2018 05:49:40 +0000 (13:49 +0800)]
hf mf ecfill: Add the missing line break.
Arnie97 [Thu, 25 Jan 2018 05:43:01 +0000 (13:43 +0800)]
Fix typo in lua scripts: 1443a -> 14443a.
Iceman [Wed, 24 Jan 2018 09:47:59 +0000 (10:47 +0100)]
Merge pull request #551 from pwpiwi/remove_reveng
Remove reveng
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)
Iceman [Tue, 23 Jan 2018 16:43:07 +0000 (17:43 +0100)]
Merge pull request #550 from pwpiwi/fix_warnings
fix clang compiler warnings
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
Iceman [Mon, 22 Jan 2018 18:33:41 +0000 (19:33 +0100)]
Merge pull request #549 from rkblackfire/master
Debug&Improvement of HW TUNE
rkblackfire [Mon, 22 Jan 2018 18:25:22 +0000 (19:25 +0100)]
Revert "dbg: Watchdog resets while 'hw tune lf'"
This reverts commit
fc175230f431e7e33c7628c6b31064d4f7d1e1ad .
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
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'
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
merlokk [Wed, 17 Jan 2018 16:16:37 +0000 (18:16 +0200)]
added nested authentication "not implemented" warning
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)
merlokk [Wed, 17 Jan 2018 14:12:50 +0000 (16:12 +0200)]
fix eml file format
merlokk [Wed, 17 Jan 2018 14:01:56 +0000 (16:01 +0200)]
added magic cards
merlokk [Wed, 17 Jan 2018 13:57:24 +0000 (15:57 +0200)]
ignore SELECT ALL
merlokk [Wed, 17 Jan 2018 13:48:01 +0000 (15:48 +0200)]
SNF_WUPREQ and SNF_SAK harmonized)
merlokk [Wed, 17 Jan 2018 12:14:36 +0000 (14:14 +0200)]
deleted save UID from card
merlokk [Wed, 17 Jan 2018 12:10:26 +0000 (14:10 +0200)]
delete opposite states fix
merlokk [Tue, 16 Jan 2018 15:54:54 +0000 (17:54 +0200)]
fixed #541
merlokk [Tue, 16 Jan 2018 12:34:04 +0000 (14:34 +0200)]
`hf mf sniff` small fix
Iceman [Mon, 15 Jan 2018 15:06:37 +0000 (16:06 +0100)]
Merge pull request #503 from merlokk/travis
Travis
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)
Oleg Moiseenko [Fri, 12 Jan 2018 21:37:55 +0000 (23:37 +0200)]
hf mf sniff: small fixes
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
pwpiwi [Fri, 12 Jan 2018 20:48:42 +0000 (21:48 +0100)]
hw tune:
* scale results to allow higher LF voltages
* remove historic comments
pwpiwi [Thu, 11 Jan 2018 07:32:01 +0000 (08:32 +0100)]
hw tune minor fix, comments updated
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
merlokk [Sun, 7 Jan 2018 21:23:35 +0000 (23:23 +0200)]
move appveyor.yml
Iceman [Sat, 6 Jan 2018 17:54:27 +0000 (18:54 +0100)]
Merge pull request #538 from merlokk/hardnestedsetsimd
hardnested SIMD select
Iceman [Sat, 6 Jan 2018 17:54:09 +0000 (18:54 +0100)]
Merge pull request #534 from pwpiwi/fix_printf
Minor fixes
merlokk [Sat, 6 Jan 2018 17:14:34 +0000 (19:14 +0200)]
fix another way
merlokk [Fri, 5 Jan 2018 16:36:00 +0000 (18:36 +0200)]
fix #404
merlokk [Fri, 5 Jan 2018 11:04:17 +0000 (13:04 +0200)]
fix readme
merlokk [Fri, 5 Jan 2018 09:57:11 +0000 (11:57 +0200)]
Merge branch 'master' of github.com:Proxmark/proxmark3 into travis
merlokk [Fri, 5 Jan 2018 09:51:51 +0000 (11:51 +0200)]
move travis files
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.
merlokk [Tue, 2 Jan 2018 20:28:13 +0000 (22:28 +0200)]
works
merlokk [Tue, 2 Jan 2018 17:11:26 +0000 (19:11 +0200)]
add print SIMD core at the beginning
merlokk [Tue, 2 Jan 2018 17:05:12 +0000 (19:05 +0200)]
hardnested SIMD select
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.
Michael Farrell [Thu, 28 Dec 2017 17:27:39 +0000 (03:27 +1000)]
Allow externalisation of PrintAndLog (#506)
pwpiwi [Thu, 28 Dec 2017 17:23:41 +0000 (18:23 +0100)]
Merge branch 'master' into fix_printf
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
merlokk [Thu, 28 Dec 2017 11:29:30 +0000 (13:29 +0200)]
fix #532. looks at length of parameters.
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
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.
Iceman [Wed, 27 Dec 2017 08:41:50 +0000 (09:41 +0100)]
Merge pull request #531 from pwpiwi/loclass_gpl
Update loclass license conditions
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
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
merlokk [Sat, 23 Dec 2017 23:11:43 +0000 (01:11 +0200)]
fixed condition
merlokk [Sat, 23 Dec 2017 22:28:38 +0000 (00:28 +0200)]
added xcode 9.2 and some logging
marshmellow42 [Sat, 23 Dec 2017 22:17:43 +0000 (17:17 -0500)]
Merge pull request #528 from Proxmark/iceman1001-patch-1
Update cmdmain.c
merlokk [Sat, 23 Dec 2017 21:59:47 +0000 (23:59 +0200)]
inc timeout
merlokk [Sat, 23 Dec 2017 21:50:51 +0000 (23:50 +0200)]
add `hf emv test` to appveyor config
Iceman [Sat, 23 Dec 2017 21:14:04 +0000 (22:14 +0100)]
Update cmdmain.c
cherry picking at fix for LF SNOOP,
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
marshmellow42 [Thu, 21 Dec 2017 13:02:19 +0000 (08:02 -0500)]
Merge pull request #526 from Proxmark/marshmellow42-patch-1
Update lfsampling.c
Iceman [Thu, 21 Dec 2017 06:55:51 +0000 (07:55 +0100)]
Update lfsampling.c
@marshmellow42 's fix for #514
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)
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
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'
Iceman [Sat, 16 Dec 2017 16:08:45 +0000 (17:08 +0100)]
Update cmdhficlass.h
...hm.. cut'nd'paste error...
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
Iceman [Fri, 15 Dec 2017 14:48:25 +0000 (15:48 +0100)]
Update cmdhficlass.h
add function head
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
pwpiwi [Mon, 11 Dec 2017 19:40:09 +0000 (20:40 +0100)]
fix iso14a_set_timeout() adjustment
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.
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
ikarus [Wed, 6 Dec 2017 22:30:27 +0000 (23:30 +0100)]
fix: usage and sample text of hf mf cwipe
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 &>
pwpiwi [Wed, 6 Dec 2017 08:25:10 +0000 (09:25 +0100)]
fixing the fix: older shells don't know about &>
Iceman [Tue, 5 Dec 2017 16:26:20 +0000 (17:26 +0100)]
Merge pull request #507 from pwpiwi/fix_AVX512
fix: AVX512 detection
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
pwpiwi [Tue, 5 Dec 2017 07:25:10 +0000 (08:25 +0100)]
fix: AVX512 detection
merlokk [Mon, 4 Dec 2017 20:20:29 +0000 (22:20 +0200)]
small refactoring
merlokk [Sun, 3 Dec 2017 18:36:04 +0000 (20:36 +0200)]
added 9f0a tag
merlokk [Sun, 3 Dec 2017 18:28:36 +0000 (20:28 +0200)]
added a tag
merlokk [Sat, 2 Dec 2017 20:12:41 +0000 (22:12 +0200)]
get rid of tabs)
merlokk [Sat, 2 Dec 2017 20:10:25 +0000 (22:10 +0200)]
added if
merlokk [Sat, 2 Dec 2017 19:47:30 +0000 (21:47 +0200)]
transactions MSD and M/Chip, qVSDC works
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
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
merlokk [Sat, 2 Dec 2017 14:24:47 +0000 (16:24 +0200)]
remove show options
merlokk [Sat, 2 Dec 2017 11:06:51 +0000 (13:06 +0200)]
add options show
merlokk [Sat, 2 Dec 2017 09:51:12 +0000 (11:51 +0200)]
added info
merlokk [Fri, 1 Dec 2017 16:57:31 +0000 (18:57 +0200)]
rename travis file
merlokk [Fri, 1 Dec 2017 16:54:54 +0000 (18:54 +0200)]
added REPOSITORY_EP var
merlokk [Fri, 1 Dec 2017 16:49:31 +0000 (18:49 +0200)]
init travis from https://github.com/pwpiwi/proxmark3/tree/travis_test
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
merlokk [Thu, 30 Nov 2017 17:34:20 +0000 (19:34 +0200)]
added hint on `hf 14a apdu`. close #495