github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-07-10 15:32:41 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions
2355 commits 3 branches 11 tags 34 MiB
Commit graph

2355 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Iceman
feb1bf4184
Merge pull request #515 from pwpiwi/fix_14atimeout 
fix: hf mf hardnested failed with new WUPA timing
 2017-12-12 15:50:53 +01:00
pwpiwi
fa85b08504 fix iso14a_set_timeout() adjustment 2017-12-11 20:40:09 +01:00
pwpiwi
7c7327e7c8 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.
 2017-12-10 19:27:46 +01:00
Iceman
bc3b2f7f94
Merge pull request #511 from ikarus23/typo 
fix: usage and sample text of hf mf cwipe
 2017-12-07 00:00:10 +01:00
ikarus
6148817a7f fix: usage and sample text of hf mf cwipe 2017-12-06 23:30:27 +01:00
Iceman
8afa9712f7
Merge pull request #508 from pwpiwi/fix_AVX512 
fixing the fix: older shells don't know about &>
 2017-12-06 17:26:49 +01:00
pwpiwi
1ff75f168b fixing the fix: older shells don't know about &> 2017-12-06 09:25:10 +01:00
Iceman
0fb3e45541
Merge pull request #507 from pwpiwi/fix_AVX512 
fix: AVX512 detection
 2017-12-05 17:26:20 +01:00
Iceman
385e4b5019
Merge pull request #504 from merlokk/emv3 
EMV3. hf emv exec 2nd part
 2017-12-05 15:39:37 +01:00
pwpiwi
c656c870ae fix: AVX512 detection 2017-12-05 08:25:10 +01:00
merlokk
7a7afeba5c small refactoring 2017-12-04 22:20:29 +02:00
merlokk
5a1b25ac31 added 9f0a tag 2017-12-03 20:36:04 +02:00
merlokk
f7ec230e98 added a tag 2017-12-03 20:28:36 +02:00
merlokk
1e431c5d36 get rid of tabs) 2017-12-02 22:12:41 +02:00
merlokk
b0c73387f0 added if 2017-12-02 22:10:25 +02:00
merlokk
10d4f82338 transactions MSD and M/Chip, qVSDC works 2017-12-02 21:47:30 +02:00
Iceman
2db66b01da
Merge pull request #493 from merlokk/emv2 
Emv2. next part of EMV work
 2017-12-02 18:39:14 +01:00
merlokk
245a6b2083 added xcode 9 and 9.1 coz 8 and 8.1 links to 8.3 2017-12-02 16:41:39 +02:00
merlokk
3c9b6573ec remove show options 2017-12-02 16:24:47 +02:00
merlokk
a36b278fad add options show 2017-12-02 13:06:51 +02:00