RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-11-11 10:14:34 +08:00
Code Issues Projects Releases Packages Wiki Activity
5563 commits 3 branches 14 tags 86 MiB
Commit graph

3587 commits

Author SHA1 Message Date
vratiskol
49f0b35ffd Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-19 16:48:45 +01:00
iceman1001
ab226c2864 detectST has better clock detection. Since 'data raw am' fails but 'data detect a' succeed in finding a clock. Lets see if anything else breaks because of this? 2019-03-19 10:20:10 +01:00
vratiskol
1e20316cee Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-19 02:07:22 +01:00
iceman1001
f79c0075c4 style 2019-03-19 00:12:46 +01:00
iceman1001
e3dbbd3271 style 2019-03-19 00:11:32 +01:00
iceman1001
fb9d34447e style 2019-03-18 23:59:35 +01:00
iceman1001
690400d145 style 2019-03-18 23:57:44 +01:00
iceman1001
b7b7840ae1 bool 2019-03-18 23:57:00 +01:00
iceman1001
b8c5faee92 style 2019-03-18 23:55:53 +01:00
iceman1001
2276779b01 style 2019-03-18 23:55:39 +01:00
vratiskol
efa03a1e55 Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-18 23:52:39 +01:00
iceman1001
122807148c style 2019-03-18 23:49:51 +01:00
iceman1001
26804cb85f style 2019-03-18 23:48:40 +01:00
iceman1001
fd198b0048 mem leaks 2019-03-18 23:46:26 +01:00
iceman1001
35592b979d unsigned long long 2019-03-18 23:43:44 +01:00
iceman1001
b57c2d5935 reverting.. 2019-03-18 23:31:04 +01:00
vratiskol
3c96440215 Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-18 22:49:42 +01:00
iceman1001
7344d9128f style 2019-03-18 22:35:33 +01:00
iceman1001
e26e666734 style 2019-03-18 22:31:31 +01:00
iceman1001
93a91454f9 style and fixes 2019-03-18 22:30:13 +01:00
vratiskol
c08c14656b Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-18 22:26:57 +01:00
iceman1001
17f5df152b style 2019-03-18 22:16:05 +01:00
iceman1001
b9cbc5cb7f bad logic 2019-03-18 22:14:07 +01:00
iceman1001
580159ed97 mem leak 2019-03-18 22:11:31 +01:00
iceman1001
4288e9db73 style 2019-03-18 22:04:53 +01:00
iceman1001
524ed17894 styles 2019-03-18 21:56:44 +01:00
iceman1001
38b24d94ba mem leaks 2019-03-18 21:53:57 +01:00
vratiskol
c2c4aac7ff Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-18 21:51:29 +01:00
iceman1001
910b5f31c2 null terminated 2019-03-18 21:49:15 +01:00
iceman1001
1b48948486 clear 2019-03-18 21:45:06 +01:00
iceman1001
4fdbe9c3b2 chg: 'hf mf hard' - negativ comparison 
style
 2019-03-18 21:29:35 +01:00
iceman1001
aafa627095 style 2019-03-18 21:26:02 +01:00
iceman1001
52b90d3d6b bad comparission 2019-03-18 21:24:10 +01:00
iceman1001
dce51f34ed style 2019-03-18 21:21:15 +01:00
iceman1001
7deb99b999 realloc check? 2019-03-18 20:35:03 +01:00
iceman1001
20019b14ee style 2019-03-18 20:34:00 +01:00
iceman1001
5350f871ff style 2019-03-18 20:29:18 +01:00
iceman1001
4f88d7105f style 2019-03-18 20:24:09 +01:00
iceman1001
3727abd28c style 2019-03-18 20:17:24 +01:00
iceman1001
6889489555 uninit? 2019-03-18 20:02:00 +01:00
iceman1001
9e6b109856 string formatter 2019-03-18 20:01:17 +01:00
iceman1001
1d14c497b7 swapping order 2019-03-18 17:53:46 +01:00
iceman1001
cc9a99ed57 string formats 2019-03-18 17:46:52 +01:00
iceman1001
3e26b564cd nameing stuff 2019-03-18 17:42:49 +01:00
iceman1001
c8c9a69e3e unsigned value cant be less than zero 2019-03-18 16:59:21 +01:00
iceman1001
2a6be74fd1 fix: operations inside macro expansion 2019-03-18 16:57:41 +01:00
iceman1001
e92977f4bd Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-03-17 13:53:38 +01:00
iceman1001
c9cb16d428 fix: mfkey32, cut and paste error? 2019-03-17 13:51:47 +01:00
Iceman
9f9ee2f1fd
Update ntag_3d.lua 2019-03-16 11:22:36 +01:00
iceman1001
5583cfbc70 chg: 'lf search' - text 2019-03-16 11:07:49 +01:00
Philippe Teuwen
4632cc0203 typo 2019-03-16 10:50:01 +01:00
iceman1001
1fcd0f66c5 fix: null check 2019-03-16 07:31:13 +01:00
iceman1001
c83b2e7fff fix: null check 2019-03-16 07:31:00 +01:00
iceman1001
3efa05060e chg: update reveng v1.6.0 -> v1.6.2 2019-03-16 07:18:58 +01:00
Philippe Teuwen
a856ad638c Adjust mifare_autopwn to latest hf mf dump 2019-03-16 01:35:34 +01:00
Philippe Teuwen
f51e6fbad2 fix double free 2019-03-16 01:26:15 +01:00
iceman1001
35da3707d3 fix: 'hf iclass decrypt' - use after free 2019-03-15 22:07:21 +01:00
iceman1001
48a28fa575 fix: mem leaks 2019-03-15 22:05:36 +01:00
vratiskol
cfe2b2797e Revert "Merge branch 'master' into hf_mf_sim" 
This reverts commit cbea5d9d02, reversing
changes made to b66152feb2.
 2019-03-15 21:45:00 +01:00
vratiskol
cbea5d9d02 Merge branch 'master' into hf_mf_sim 2019-03-15 21:17:44 +01:00
vratiskol
6a52b6074f Sync from Upstream 2019-03-15 21:17:07 +01:00
vratiskol
64c3ae8b34 hf mf sim 2019-03-15 21:04:25 +01:00
iceman1001
f0d5b79abb chg: 'lf hitag reader' - more output 2019-03-15 20:10:17 +01:00
iceman1001
24df97b09b chg; remove compiler warning 2019-03-15 10:00:47 +01:00
Philippe Teuwen
2d2b128754 make style 2019-03-15 09:18:07 +01:00
iceman1001
b6f80e075b textual 2019-03-15 02:05:44 +01:00
iceman1001
e3127f7440 fix: 'hf 14b raw -t' - a bit messed up 2019-03-15 02:05:15 +01:00
iceman1001
c143f79e65 chg: 'sc upgrade' - verify firmware file integrity with sha512 validation (@piwi) 2019-03-15 01:54:43 +01:00
iceman1001
248135682c mix in proxmark code.. 2019-03-15 00:40:29 +01:00
iceman1001
bf99a181a8 free? 2019-03-15 00:32:50 +01:00
Philippe Teuwen
9b3cc10e0b fix Coverity string overflow 2019-03-15 00:27:26 +01:00
iceman1001
8f78c9d45e Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-03-15 00:22:15 +01:00
iceman1001
f760677e32 overflow 2019-03-15 00:21:43 +01:00
Philippe Teuwen
b538a67ba3 make style 2019-03-15 00:20:42 +01:00
Philippe Teuwen
2f2dfd6239 remove debug line 2019-03-15 00:19:18 +01:00
Philippe Teuwen
f1a0e57f65 binarraytohex: handle Manchester wrong bit markers 2019-03-15 00:09:40 +01:00
iceman1001
da5ad8438c textual 2019-03-14 23:31:33 +01:00
iceman1001
5c3f12ee43 chg: 'lf hitag info' - added printing of configuration byte. (work-in-progress) 2019-03-14 23:30:45 +01:00
osboxes.org
9c2736d1eb spaces 2019-03-14 12:30:32 +01:00
iceman1001
71160ddbca fiddling 2019-03-14 11:34:32 +01:00
iceman1001
55f4942ab7 text 2019-03-14 11:30:49 +01:00
iceman1001
b65dc0a4c8 text 2019-03-14 11:29:50 +01:00
iceman1001
cbab48659e fix: 'lf hitag sim' - mem leaks 
fix: 'lf hitag cc' - mem leaks
 2019-03-14 11:20:44 +01:00
iceman1001
1f8040596f fix: 'hf 15 dump f' - now also selects card 2019-03-14 10:23:58 +01:00
iceman1001
e5a71fdd26 fix: 'hf iclass clone' - missing fclose 2019-03-14 10:01:07 +01:00
iceman1001
15020ffaa2 add: 'lf hitag info' - added a skeleton function. Needs to gather and print tag information. 2019-03-14 08:30:20 +01:00
iceman1001
7d88c22aaf chg: added limit check for loadfile 
rename: 'lf hitag checkchallenges'  ->  'lf hitag cc'
chg: 'lf hitag checkchallenges' - refactored, added helptext
 2019-03-14 08:24:49 +01:00
iceman1001
e4a9e348d6 chg: 'lf hitag list' - now uses the generic list. 2019-03-14 07:42:48 +01:00
iceman1001
2c44136913 chG: 'trace list hitag' - started to unify hitag2/S annotation 2019-03-13 23:05:45 +01:00
iceman1001
5608df9771 chg: refactored away hitag logtrace. 2019-03-13 22:48:51 +01:00
iceman1001
e3afad8758 CHG: 'lf hitag sim' - now loads from BIN/EML/JSON. Also merged it with 'lf hitag simS', which is removed. 2019-03-13 20:16:11 +01:00
iceman1001
072e83bc49 chg: 'lf hitag reader' - now support json format 2019-03-13 17:50:10 +01:00
iceman1001
b35ea2e352 chg: 'lf hitag writer' - refactored with timeouts etc. 
chg: 'lf hitag'  test without toggle mode enabled
 2019-03-13 16:44:32 +01:00
iceman1001
dda69c593a chg: 'lf hitag reader 21' - now save BIN/EML formats. 2019-03-13 16:31:34 +01:00
iceman1001
a117f06380 chg: refactoring of hitag (@piwi) 
chg:  refactoring of hitagS (@iceman)
 2019-03-13 12:18:37 +01:00
Philippe Teuwen
d9308d912d fix: shifting signed 32-bit value by 31 bits is undefined behaviour 2019-03-13 00:07:40 +01:00
Philippe Teuwen
98ff923d61 fix more strncat usage (one must specify available room, not total dest buffer size) 2019-03-12 22:06:37 +01:00
iceman1001
33f9af9619 chg 'data AutoCorrelate' - adjust the manual limit to 4% 2019-03-12 20:50:44 +01:00
iceman1001
1d63258388 add: 'hf 14b raw' - added -t timeout option. see https://github.com/RfidResearchGroup/proxmark3/issues/125 2019-03-12 14:41:23 +01:00
iceman1001
35bc4a975e rename SNOOP -> SNIFF 2019-03-12 13:15:39 +01:00
iceman1001
77693521df rename idteck 2019-03-12 12:56:59 +01:00
iceman1001
a35025f33f rename snoop -> sniff 2019-03-12 12:56:39 +01:00
Philippe Teuwen
1b2601a48a Add missing EOF LF 2019-03-12 00:12:26 +01:00
Philippe Teuwen
346af6e3d1 make style 2019-03-11 23:12:31 +01:00
merlokk
f24d7c4ba1 fix mfp wrbl command 2019-03-11 18:02:42 +02:00
iceman1001
fd642e8f51 adjustemnts 2019-03-11 15:08:34 +01:00
iceman1001
ff22f0ca7a rename: 
'lf snoop' -> 'lf sniff'
 'hf snoop' -> 'hf sniff'

As of now its gonna be called sniffing everywhere in the repo.
chg: 'lf search' textual
chg: 'hf search' textual
 2019-03-11 14:55:02 +01:00
iceman1001
eb906859b5 fix: 'lf ti demod' - hide debug messages 2019-03-11 07:38:20 +01:00
Philippe Teuwen
119e3f0ed9 Makefile: allow alternative platforms, try make PLATFORM=foo 2019-03-11 00:44:34 +01:00
iceman1001
7f26ed6e9f chg: 'lf hitag reader' - helptext 2019-03-10 14:44:21 +01:00
iceman1001
7921e363b0 output 2019-03-10 14:42:43 +01:00
Philippe Teuwen
73437dea62 Makefile: avoid compiling hardnested multiarch stuff systematically 2019-03-10 12:22:02 +01:00
Philippe Teuwen
21e6f2d861 jansson, tinycbor, mbedtls: avoid recompilations if not needed 2019-03-10 11:42:38 +01:00
Philippe Teuwen
2f12e57408 Makefiles: remove spurious spaces/tabs 2019-03-10 11:35:03 +01:00
Philippe Teuwen
961d929f4d changing {} style to match majority of previous style 2019-03-10 11:20:22 +01:00
Philippe Teuwen
da6cdf014b Keep string syntax in color macros 2019-03-10 00:56:00 +01:00
Philippe Teuwen
48124f89b4 fix ‘sprintf’ output between 15 and 19 bytes into a destination of size 18 2019-03-10 00:24:29 +01:00
Philippe Teuwen
22b43c65ec fix warning: format ‘%d’ expects argument of type ‘int’, but argument 3 has type ‘size_t’ {aka ‘long unsigned int’} 2019-03-10 00:11:39 +01:00
Philippe Teuwen
554011f828 Fix warning: ‘strncpy’ output truncated before terminating nul copying as many bytes from a string as its length 2019-03-10 00:09:46 +01:00
Philippe Teuwen
0373696662 make style 2019-03-10 00:00:59 +01:00
Philippe Teuwen
0d9223a547 client: fix mix of spaces & tabs 2019-03-09 23:35:06 +01:00
iceman1001
112411042f cleaning up 2019-03-09 21:59:00 +01:00
iceman1001
38503b55d5 chg: cleanup 2019-03-09 21:43:03 +01:00
iceman1001
902a5f06ff chg: 'lf search' - added TI detection 2019-03-09 21:42:40 +01:00
iceman1001
e8d15d0c18 FIX: 'data load' - now loads large files again (TITEST.txt) 2019-03-09 20:47:57 +01:00
iceman1001
9ebf3f4f6d chg: use bool instead 2019-03-09 20:34:20 +01:00
iceman1001
89db6064d0 fix: 'lf paradox demod' - wrong check 2019-03-09 17:25:53 +01:00
iceman1001
6d364ec70d chg: 'data detectclocks' - skip if isnoise 2019-03-09 14:00:46 +01:00
iceman1001
aebfe193dc chg: 'data raw' - skip if signal is noise 2019-03-09 13:54:03 +01:00
iceman1001
45e8403d4d fix: 'lf t55' - aquiredata uses getsamples 2019-03-09 12:54:39 +01:00
iceman1001
cc81b5bed9 fix: tolower 2019-03-09 12:31:29 +01:00
iceman1001
6b9e5e0400 chg: unified code 2019-03-09 11:36:05 +01:00
iceman1001
d998602690 textual 2019-03-09 11:31:53 +01:00
iceman1001
cc9ec2d79c textual 2019-03-09 11:30:26 +01:00
iceman1001
e093d1ab29 Adds colors, etc 2019-03-09 11:29:34 +01:00
iceman1001
dc36bd5e5a fix: 'lf CheckChipType' - restores demodbuff/graphbuf properly 2019-03-09 11:13:46 +01:00
iceman1001
59eb83bf90 fix: use defines instead. 2019-03-09 11:10:54 +01:00
Philippe Teuwen
2d1a077ae4 lua: more fix mix of spaces & tabs 2019-03-09 10:40:45 +01:00
Philippe Teuwen
05ff45e550 lua: fix mix of spaces & tabs 2019-03-09 10:34:43 +01:00
Philippe Teuwen
bdd0494290 remove spurious spaces & tabs at end of lines: cpp files 2019-03-09 09:11:08 +01:00
Philippe Teuwen
60f292b18e remove spurious spaces & tabs at end of lines 2019-03-09 08:59:13 +01:00
Philippe Teuwen
edc19f202a Convert the few files with still Windows carriage returns 2019-03-09 08:49:41 +01:00
Philippe Teuwen
d8788bb376 appease coverity 2019-03-09 08:43:28 +01:00
Iceman
17435d366f
Merge pull request #122 from RfidResearchGroup/computeSignalProperties 
Replace isNoise by computeSignalProperties and removeSignalOffset
 2019-03-09 08:35:37 +01:00
iceman1001
810f92dbab FIX: 'lf visa read' - increase samples solves #123 2019-03-09 08:29:37 +01:00
iceman1001
1cf3e1b581 fix: 'lf visa' - use defines instead 2019-03-09 08:14:42 +01:00
Philippe Teuwen
1cba26decf remove redundant removeSignalOffset 2019-03-08 20:30:54 +01:00
Philippe Teuwen
ae719c3b05 Fix CmdT55xxBruteForce infinite loop 2019-03-08 20:10:16 +01:00
Philippe Teuwen
abddff513e loadFile: fix double free 2019-03-08 19:49:12 +01:00
Philippe Teuwen
4160e32b0a Replace isNoise by computeSignalProperties and removeSignalOffset 2019-03-08 19:06:55 +01:00
iceman1001
9764381aa4 fix: ndef - missing comma 2019-03-08 17:25:36 +01:00
Chris
2a761e80db chg: analyse nuid' - added colors 2019-03-07 19:48:20 +01:00
Philippe Teuwen
259a561a69 analyse nuid: better ref and selftest from ref + little fix 2019-03-07 15:55:53 +01:00
Philippe Teuwen
c5e1f9989c analyse nuid: fix crc -> selftest ok now 2019-03-06 20:16:12 +01:00
merlokk
cfcdbcdcee added some checks into madcheck 2019-03-06 00:50:12 +02:00
merlokk
05f5fb3e47 del verbose on warning 2019-03-06 00:43:59 +02:00
Philippe Teuwen
4dfcb727af cmds history: don't push to history if last command is replayed 2019-03-05 21:15:54 +01:00
Philippe Teuwen
581043bc90 Look for aidlist.json in the client dir 2019-03-05 20:33:18 +01:00
Oleg Moiseenko
8302751db7
Merge pull request #112 from merlokk/ndef_tlv 
Ndef reading for and mfp
 2019-03-05 19:58:28 +02:00
merlokk
2e8771d7a3 added hf mf ndef 2019-03-05 19:57:08 +02:00
merlokk
53e0d03098 ndef cert right decode. 
https://github.com/skjolber/ndef-tools-for-android/blob/master/ndeftools/src/org/ndeftools/wellknown/SignatureRecord.java
https://github.com/nfcpy/ndeflib/blob/master/src/ndef/signature.py
 2019-03-05 19:41:50 +02:00
merlokk
04a6a63427 rename 2019-03-05 18:43:12 +02:00
merlokk
581fe408ba ndef sig decoding 2019-03-05 18:14:30 +02:00
merlokk
a2be59db25 URI decode 2019-03-05 17:50:51 +02:00
merlokk
c7c97d35b5 some code to decoding payload 2019-03-05 17:25:11 +02:00
merlokk
7003783c08 refactoring 2019-03-05 16:43:13 +02:00
merlokk
fffa921aa0 ndef record decode OK 2019-03-05 16:41:20 +02:00
Iceman
5228cb5338
Merge pull request #110 from mazodude/master 
Delete MAD script as merlokk has implemented it
 2019-03-05 04:39:06 +01:00
merlokk
34a133451e small addon 2019-03-05 01:02:54 +02:00
merlokk
3bf618ca56 log structure 2019-03-05 00:54:45 +02:00
merlokk
64a5b355b5 added ndef record parse sketch 2019-03-05 00:51:32 +02:00
merlokk
a2f8f0628c added ndef tlv parsing 2019-03-05 00:48:02 +02:00
merlokk
0a30e03aaf add header 2019-03-05 00:13:01 +02:00
merlokk
cbe25f4832 add ndef.c/h 2019-03-05 00:11:31 +02:00
mazodude
760cd7b87c Delete MAD script as merlokk has implemented it 2019-03-05 08:36:04 +11:00
mazodude
fef7e78957 Merge remote-tracking branch 'upstream/master' 2019-03-05 08:35:03 +11:00
sh7d
59bae84531 Mifare mad - do not exit if checksum is shitty 2019-03-04 22:12:10 +01:00
Philippe Teuwen
0944a12744 Add missing header 2019-03-04 20:27:57 +01:00
merlokk
e191219d8a reading NDEF data from card 2019-03-04 20:22:25 +02:00
merlokk
54e8196774 hf mfp ndef sketch 2019-03-04 20:04:24 +02:00
merlokk
9c8e60cf03 added to hf mf mad 2019-03-04 19:44:19 +02:00
merlokk
f45c330843 small visual fixes 2019-03-04 19:25:13 +02:00
merlokk
2c07bb790c hf mfp mad read contents by aid 2019-03-04 19:18:44 +02:00
Chris
dcdb2ee218 fix: 'script run ndef_dump.lua' - move function 2019-03-01 19:24:02 +01:00
Chris
11f86c2d95 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-03-01 19:08:08 +01:00
merlokk
ee9daac029 Merge branch 'master' of github.com:merlokk/proxmark3i into mf_mad 
# Conflicts:
#	client/cmdhfmf.c
#	client/mifare/mifarehost.c
 2019-03-01 19:37:43 +02:00
merlokk
3a98c9fcd3 fix mad2 crc8 check 2019-03-01 19:13:59 +02:00
merlokk
979aa678ad small fix 2019-03-01 19:07:34 +02:00
merlokk
5cc4bea4e3 mfp refactoring 2019-03-01 19:05:51 +02:00
merlokk
6208a6869c added mad decode for mfp 2019-03-01 18:50:25 +02:00
merlokk
4d79ced1a9 ашчуы шт ьфвюс 2019-03-01 18:49:53 +02:00
Chris
ef2fc5b66c fix: 'hw tune' - reset demodplot line and grid clock 2019-03-01 12:09:35 +01:00
iceman1001
d73c501ffa another 2019-02-26 22:27:33 +01:00
Chris
8f05aa6fcf Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-02-25 22:34:30 +01:00
Chris
c2046f2e65 CHG: 'hf mf dump' - now saves in BIN/EML/JSON default 
CHG: 'hf mf esave' - now saves in BIN/EML/JSON default
 2019-02-25 22:33:49 +01:00
iceman1001
8c6312e209 fix mem leaks 2019-02-25 19:10:37 +01:00
iceman1001
972f8590e0 fix dereference 2019-02-25 19:10:00 +01:00
iceman1001
56a75fbf0b fix: bad division 2019-02-25 19:03:31 +01:00
iceman1001
d6bb8d630a fix: strings 2019-02-25 19:03:14 +01:00
3ldidi94
d929f31eb3
Update default_iclass_keys.dic 2019-02-25 18:52:44 +01:00
iceman1001
64bae8c8be fix: 'data detectclock' - now prints clock again... 2019-02-25 15:07:31 +01:00
Chris
711d384e7d chg: 'data autocorrelate g' - visual with gridclock patter and markup of two tops. Also added a "visual" inspection of peaks with 3% tolerance. This increases usability quite much. 2019-02-25 12:44:21 +01:00
iceman1001
a8eb0fd05f colors 2019-02-25 00:38:48 +01:00
iceman1001
a4ecc6d3ce colors 2019-02-25 00:32:59 +01:00
iceman1001
e3a0594b98 colors 2019-02-25 00:31:00 +01:00
iceman1001
7945b5a805 colors 2019-02-25 00:15:39 +01:00
iceman1001
ae4e3b72af chg: colors 2019-02-25 00:10:02 +01:00
iceman1001
bd26794c20 revert 2019-02-24 23:57:04 +01:00
iceman1001
2b9eb401fa fix: more checks 2019-02-24 23:54:36 +01:00
iceman1001
142b3d8de5 fix: assign 2019-02-24 23:54:24 +01:00
iceman1001
0803e532cc fix: 'hf felica list' - string overflows 2019-02-24 23:51:23 +01:00
iceman1001
3d84e4dc03 fix: dead code 2019-02-24 23:43:35 +01:00
iceman1001
2e3694aa3b fix: 'trace list' - missing break 2019-02-24 23:40:11 +01:00
iceman1001
34a17f842d fix 2019-02-24 22:34:14 +01:00
iceman1001
da9c662b23 text 2019-02-24 22:31:24 +01:00
iceman1001
157e08f51d fix: mem leaks 2019-02-24 22:17:36 +01:00
iceman1001
f59e67c00c fix: possible overrun 2019-02-24 21:42:30 +01:00
iceman1001
528e8fe395 fix: clock can't be zero or negative 2019-02-24 21:21:56 +01:00
iceman1001
a0e061fcd1 fix: rearrange it 2019-02-24 20:11:05 +01:00
iceman1001
17fcd8c24b fix: possible bad null ref 2019-02-24 20:00:41 +01:00
iceman1001
c650c23856 fix: 'lf flexdemod' - bad types 2019-02-24 19:57:57 +01:00
iceman1001
47c808fd5c fix: check return value 2019-02-24 19:50:24 +01:00
iceman1001
a49b3763dd fix: bad check 2019-02-24 19:50:05 +01:00
iceman1001
aaac99fdee fix: 'hf mf csave' unused code 2019-02-24 19:46:09 +01:00
iceman1001
f58c47a7b8 cleanup 2019-02-24 19:38:16 +01:00
iceman1001
01cf818e48 remove a warning 2019-02-24 19:32:14 +01:00
iceman1001
8e01c9899f aaaaaa 2019-02-24 18:31:59 +01:00
iceman1001
6b1ae818a5 fix: bad break.. 2019-02-24 18:27:56 +01:00
iceman1001
7b9a5eb7e3 text 2019-02-24 17:32:01 +01:00
iceman1001
a47085a7b4 text 2019-02-24 17:30:55 +01:00
iceman1001
4b7f6089ae text 2019-02-24 17:30:05 +01:00
iceman1001
95f8a48b56 text 2019-02-24 17:28:54 +01:00
iceman1001
e2d253f641 text 2019-02-24 17:25:55 +01:00
iceman1001
92631bdfb4 text 2019-02-24 17:25:47 +01:00
iceman1001
4b0f13a2e4 text 2019-02-24 17:25:40 +01:00
iceman1001
528ffd9e66 text 2019-02-24 17:23:33 +01:00
iceman1001
63659fd352 text 2019-02-24 17:22:03 +01:00
iceman1001
b22189b415 text 2019-02-24 17:11:59 +01:00
iceman1001
7de440a8a0 text 2019-02-24 17:10:30 +01:00
iceman1001
8b33d45016 fix 2019-02-24 17:08:58 +01:00
iceman1001
f750ddb2c8 text 2019-02-24 17:06:46 +01:00
iceman1001
e0579223f0 text 2019-02-24 16:48:54 +01:00
iceman1001
c310640b03 fix: 'lf jabltron clone' - wrong number of blocks 2019-02-24 16:47:43 +01:00
iceman1001
8ddf03b302 text 2019-02-24 16:43:48 +01:00
iceman1001
49ba544190 fix: 'lf search' - indala wrong identified 2019-02-24 15:33:34 +01:00
iceman1001
9f26c0d6b7 text 2019-02-24 15:29:28 +01:00
iceman1001
69b691494d text 2019-02-24 15:26:31 +01:00
iceman1001
cc2c440683 chg: 'lf search' - colors 2019-02-24 15:16:57 +01:00
iceman1001
8551f811ca colors 2019-02-24 15:13:31 +01:00
iceman1001
730304ca92 texts 2019-02-24 15:10:19 +01:00
iceman1001
7bbb2cdb9d chg: 'lf t55xx chk' - logic params. 
chg: colors
 2019-02-24 15:07:41 +01:00
iceman1001
38262389fc chg: colors 2019-02-24 14:58:22 +01:00
iceman1001
cea5b5214d chg: colors 2019-02-24 14:51:21 +01:00
iceman1001
0daf7f8b40 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-02-24 14:39:55 +01:00
iceman1001
8cc9cc312f chg... names names..sigh 2019-02-24 14:39:20 +01:00
iceman1001
1c2dea29bb chg 2019-02-24 14:38:33 +01:00
iceman1001
730b4940f8 chg: 'lf keri sim' - is kind of up, *untested* 2019-02-24 11:14:51 +01:00
iceman1001
9f10ff6e17 sugar 2019-02-24 10:26:55 +01:00
iceman1001
a07dcf7924 chg: 'lf keri clone' - correct config block (use extended modes bit rates) 2019-02-24 10:25:53 +01:00
iceman1001
fe9c65b65f chg: 'lf keri clone' - now works 2019-02-23 17:19:34 +01:00
iceman1001
d1c22d0800 fix: 'lf keri demod' - proper demod now 2019-02-23 16:29:00 +01:00
iceman1001
dc0dc7b00a chg: cleanup 2019-02-23 16:05:24 +01:00
iceman1001
92b1f41793 revert chg, double free... 2019-02-23 16:02:44 +01:00
iceman1001
e0bf2e3fbf chg: 'lf search' - hooked up Keri detection 2019-02-23 15:56:11 +01:00
Iceman
1ad139ae6e
Merge pull request #101 from sh7d/fix-em41-spoof 
em41 - spoof fix
 2019-02-23 15:50:43 +01:00
iceman1001
f5f6f5d916 chg: linking in keri 2019-02-23 15:47:37 +01:00
iceman1001
2dc3bc6af3 ADD: 'lf keri' - basic commands. 2019-02-23 15:44:34 +01:00
sh7d
c58f487cab em41 - spoof fix 2019-02-23 15:24:51 +01:00
iceman1001
22510b6f22 CHG: cleanups 2019-02-23 14:15:54 +01:00
merlokk
20be5c5d9f some of MAD2 code 2019-02-22 19:58:50 +02:00
merlokk
5122e1289d info-byte 2019-02-22 18:24:22 +02:00
merlokk
91ed51c673 add comment 2019-02-22 18:06:37 +02:00
merlokk
8010f2dc5e MAD1 OK 2019-02-22 18:05:45 +02:00
iceman1001
1b64c4cb63 fix: overflow was possible since 1000 is type long 2019-02-22 15:23:09 +01:00
iceman1001
140c327cc2 CHG: 'hf mf list' - readded it. calls trace list mf in the back 2019-02-22 09:43:03 +01:00
iceman1001
954e01c363 fix: bad loop 2019-02-21 23:38:07 +01:00
iceman1001
697af67bf1 fix: 'hf 14b info' - missing break 2019-02-21 23:37:18 +01:00
iceman1001
7ea7061ed0 fix: 'hf mf cload' - wrong free 2019-02-21 23:22:39 +01:00
iceman1001
b11f767c55 fix: 'lf em brute' - mem leak 2019-02-21 23:22:13 +01:00
iceman1001
c980ae109a fix: 'lf gprox' - wrong check value 2019-02-21 23:21:39 +01:00
iceman1001
09791638c8 fix: 'lf indala' - wrong number of bits 2019-02-21 23:21:13 +01:00
iceman1001
421604a395 fix: sc bruteforce' - wrong assign 2019-02-21 23:20:52 +01:00
merlokk
01c9325469 check MAD crc 2019-02-21 20:06:53 +02:00
merlokk
b9dc841bf9 MAD. print GPB 2019-02-21 19:44:07 +02:00
merlokk
db7580203b create mad.c/h 2019-02-21 19:34:12 +02:00
merlokk
3b21b17509 move mifare stuff to its folder 2019-02-21 19:15:46 +02:00
iceman1001
6d63b3fbed fix: mem leaks. 2019-02-21 16:17:49 +01:00
iceman1001
de317d9f48 fix: mem leaks. 2019-02-21 15:39:36 +01:00
iceman1001
91d6836a47 fix: mem leaks. 2019-02-21 15:34:31 +01:00
iceman1001
06ade9970a FIX: mem leaks 
FIX: 'hf mf nested' - params
 2019-02-20 22:29:39 +01:00
merlokk
1675b10c00 small fix 2019-02-20 21:15:44 +02:00
merlokk
583b732268 add hf mf mad command 2019-02-20 21:12:50 +02:00
merlokk
f2b600e6e9 add keys for mad and ndef 2019-02-20 21:12:28 +02:00
merlokk
54ade5df94 add read sector code 2019-02-20 21:12:06 +02:00
merlokk
2c4db1ce7c check ATR length 2019-02-20 19:37:30 +02:00
Oleg Moiseenko
d589e9cd45
Merge pull request #98 from merlokk/typ1 
typo
 2019-02-20 17:54:34 +02:00
merlokk
8ddedcb140 typo 2019-02-20 17:54:05 +02:00
merlokk
12582df976 fix macro 2019-02-20 16:05:32 +02:00
merlokk
ed991e76b4 add print error if smart card functionality not defined 2019-02-20 16:04:08 +02:00
merlokk
fe66f0fac4 added contact to emv scan 2019-02-20 15:52:26 +02:00
merlokk
8e199d4c9e add get ATR to cmdsmartcard 2019-02-20 15:51:55 +02:00
Oleg Moiseenko
200f44d94c
Merge pull request #96 from merlokk/p_err 
fix possible error
 2019-02-20 14:50:58 +02:00
merlokk
d81478755e 2nd fix 2019-02-20 14:50:17 +02:00
merlokk
915c73bcfc fix possible error 2019-02-20 14:48:52 +02:00
Chris
3d7cf1e9b7 chg: text 2019-02-20 11:29:40 +01:00
merlokk
e793fa8d73 fix tlvdb_get_uint8 2019-02-19 21:28:19 +02:00
merlokk
25d6a1274f small improvement 2019-02-19 21:19:45 +02:00
merlokk
56c9bcc03a added IAD decoding and some improvements 2019-02-19 21:15:54 +02:00
merlokk
26bca36929 delete comment 2019-02-19 18:39:05 +02:00
merlokk
bebfcab7b9 Merge branch 'master' of github.com:merlokk/proxmark3i into emv_vsdc 2019-02-19 18:34:52 +02:00
iceman1001
72cf200df7 chg.... 2019-02-18 16:43:27 +01:00
iceman1001
b320ebca7c chg: textual 2019-02-18 16:39:39 +01:00
iceman1001
58f35d50a6 chg: textual 2019-02-18 16:32:13 +01:00
iceman1001
1e98c4621d chg: colors 2019-02-18 16:30:57 +01:00
iceman1001
5ec82a0dc4 chg: adjustments 2019-02-18 16:27:56 +01:00
iceman1001
a4f6701c85 chg: cleaning 2019-02-18 16:16:24 +01:00
iceman1001
0997c55800 chg: colors 2019-02-18 16:07:39 +01:00
iceman1001
38437a3916 chg: colors 2019-02-18 15:47:48 +01:00
iceman1001
fc1ed47d57 chg: more colors 2019-02-18 15:37:26 +01:00
iceman1001
23d0b6b1c6 chg: colors 2019-02-18 14:59:19 +01:00
iceman1001
e6c68645e3 chg: colors 2019-02-18 13:28:22 +01:00
iceman1001
20ccfb036c chg: more colors 2019-02-18 13:12:25 +01:00
iceman1001
06fc95b62d chg: 'hf mf fchk' - textual 2019-02-18 10:41:54 +01:00
iceman1001
cacba04959 chg: 'hf mf fchk' - better handling when no keys was found. 2019-02-18 10:38:49 +01:00
iceman1001
7e601e5285 chg: textual 2019-02-18 10:27:14 +01:00
iceman1001
e23d53adc1 chg: 'hf mf hardnested' - speedup for those with good cpus, triggering the bruteforce faster. 2019-02-17 16:48:14 +01:00
iceman1001
4ea05fc026 Fix: 'hf mf fchk' - now reports back correct found keys. 2019-02-17 15:56:45 +01:00
Iceman
d6180309ae
Merge pull request #93 from vratiskol/master 
Use Variable for MIFARE_XXX_MAXSECTOR
 2019-02-15 18:19:18 +01:00
vratiskol
8e6b41f513 Use Variable for MIFARE_MINI_MAXSECTOR 
Modify type uint16_t => 256
 2019-02-15 15:17:28 +01:00
iceman1001
19cdedd9ec Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-02-15 12:38:53 +01:00
iceman1001
f8985ed1be chg: remove warning for overflow 2019-02-15 12:38:38 +01:00
Iceman
68797aee7e
Merge pull request #92 from vratiskol/master 
Update MAXBLOCK - MF 4K
 2019-02-15 10:53:13 +01:00
vratiskol
35df317a2c
Update MAXBLOCK - MF 4K 
- Modify MAXBLOCK size: 4k => 256
- Typo
 2019-02-15 01:08:30 +01:00
iceman1001
7934630d2b FIX: Makefile bad styled calls 2019-02-14 19:27:39 +01:00
osboxes.org
cd44ea27b7 FIX: 'script run mifare_autopwn' - now doesn't crash 2019-02-04 22:16:12 +01:00
merlokk
7678ab13e0 add slolkey CA root 2019-02-03 22:36:15 +02:00
iceman1001
95db68fa30 FIX: scripts path needed for scripts to call other scripts. 2019-02-03 10:18:22 +01:00
iceman1001
77f4492433 fix: 'hf 15 write' - faulty string formatter token 2019-02-02 19:30:32 +01:00
Iceman
845496b625
Merge pull request #86 from merlokk/14a_apdu_send_framing2 
14a apdu send framing
 2019-02-01 20:02:20 +01:00
merlokk
029e75e866 formatting 2019-02-01 18:54:57 +02:00
merlokk
34bae8adcf add hf 14a chaining 2019-02-01 18:51:53 +02:00
merlokk
09c5f0ef76 remove debug and small output addon. errors was not visible 2019-02-01 18:12:01 +02:00
merlokk
673c080ea5 client part 2019-02-01 18:00:08 +02:00
iceman1001
5c231e772c chg: use calloc 2019-01-30 21:53:10 +01:00
iceman1001
ad72a424ef chg: use calloc 2019-01-30 21:40:50 +01:00
iceman1001
99b6087b01 chg: use calloc 2019-01-30 21:16:20 +01:00
iceman1001
e81b0fa355 chg: use calloc 2019-01-30 20:43:30 +01:00
iceman1001
ed7122e409 chg: use calloc 2019-01-30 20:21:41 +01:00
iceman1001
18db34ffb0 chg: use calloc 2019-01-30 20:18:50 +01:00
merlokk
30a6ef19b9 added FSC correct calculation in hf 14a info 2019-01-30 18:16:50 +02:00