marshmellow42
083ca3de73
LF HID & IO prox fixes/options
2014-12-17 09:51:40 -05:00
pwpiwi
471c514167
Merge branch 'master' of https://github.com/Proxmark/proxmark3
2014-12-16 07:47:02 +01:00
pwpiwi
6a1f2d82bb
bugfixes iso14443a (hf 14a commands)
...
- buffers were too small to handle 256 byte frames
- parity bits were only handled for up to 32 byte frames
- trace format was inefficient
- removed parity calculation from decoders in iclass.c (parity not used on air anyway)
2014-12-16 07:41:07 +01:00
Martin Holst Swende
6116c79618
Reverted to original malicious CSNs from paper, it appears legit readers does not accept if they dont end with F7,FF,12,E0
2014-12-14 21:37:56 +01:00
Martin Holst Swende
b160432340
Merge branch 'master' of github.com:Proxmark/proxmark3
2014-12-14 18:07:38 +01:00
Martin Holst Swende
eabba3df7e
Fix (iclass)
2014-12-14 18:07:12 +01:00
András Veres-Szentkirályi
0ff9a93966
Typofix: occurrences
...
It's spelled with two rs.
2014-12-10 16:42:31 +01:00
Martin Holst Swende
d6a120a25b
Added Enios cool tuning-trick (LF) from forum-post: http://www.proxmark.org/forum/viewtopic.php?pid=13060#p13060
2014-11-30 22:30:36 +01:00
Martin Holst Swende
ca4714cd23
More coverity fixes
2014-10-30 21:49:18 +01:00
Martin Holst Swende
97d582a692
More coverity findings
2014-10-27 22:33:37 +01:00
Martin Holst Swende
90e278d3da
Fixed several issues found using a coverity-scan
2014-10-27 21:46:04 +01:00
Martin Holst Swende
f97d4e2378
First try att merging with head
2014-10-24 20:46:02 +02:00
Martin Holst Swende
e6ee6c4cd1
Merge remote-tracking branch 'origin/master' into PenturaLabs-iclass-research
2014-09-19 09:45:38 +02:00
pwpiwi
c626c56ef5
hf mf dump bugfix: wrongly tried key A instead of key B for a specific Access Condition
2014-09-12 07:45:04 +02:00
pwpiwi
79db03ef63
hf mf dump error handling, revive hf mf chk d option, provide known keys dictionary file
...
- hf mf dump: abort on unrecoverable errors. Don't create file dumpdata.bin in this case.
- hf mf chk: re-enabled and fixed option d (dump keys to dumpkeys.bin).
if there are unknown keys, write 0xffffffffffff instead to the file.
- provide a default key dictionary file for hf mf chk (default_keys.dic). Contents taken from
mf_default_keys.lua
2014-09-11 20:58:34 +02:00
pwpiwi
baeaf57950
fix/add support for 4K (and other non 1K) card sizes in hf mf commands
...
- hf mf rdsc (fix): didn't account for 16 block sectors, allowed max sector 63 instead of 39
- hf mf ecfill (add): added (optional) card size parameter and support for non 1K cards
- hf mf dump (add): added (optional) card size parameter and support for non 1K cards
- hf mf dump (fix): Access Condition 011 not handled correctly (tried to access with key A)
- hf mf restore (add): added (optional) card size parameter and support for non 1K cards
- hf mf nested (fix): didn't account for 16 block sectors, allowed max sector 63 instead of 39
- hf mf nested (fix): always dumped 16 keys to dumpkeys.bin instead of correct number
- hf mf chk (fix): always dumped 16 keys to dumpkeys.bin instead of correct number
- hf mf eget (fix): displayed three instead of one block
- hf mf eload (add): load 4K .eml files (but accepts 1K .eml files for backwards compatibility)
- hf mf esave (add): always save the whole emulator memory (4K) instead of 1K only
- hf mf ecfill (add): added (optional) card size parameter and support for non 1K cards
2014-09-10 19:04:50 +02:00
Martin Holst Swende
fdefed663f
Some more lua-scripts and library fixes from iceman, including more default keys
2014-08-29 09:11:36 +02:00
Martin Holst Swende
5b1311fba2
Various scripts from iceman
2014-08-29 09:09:23 +02:00
pwpiwi
b03c0f2d86
bugfixes hf mf sim
...
- output of debug messages caused communication failures due to timing issues.
hf mf dbg 4 now required to see these debug messages.
- changed help text for hf mf dbg
- fixed minor bugs in help texts for hf mf sim and hf mf ecset
- display "key A" or "key B" instead of "key=0" or "key=1 in hf mf sim
2014-07-30 21:23:02 +02:00
pwpiwi
991f13f27d
minor bugfixes to hf mf sniff and hf 14a snoop
...
- tracing was not always enabled when starting hf mf sniff or hf 14a snoop
- ATQA was displayed in wrong byte order in hf mf sniff
- 4 Byte UIDs were displayed as 7 Byte UIDs (padded with 0x000000) in hf mf sniff
- same for logfile names.
- assignment (=) had been used instead of == in comparisons (shouldn't have been relevant though)
2014-07-15 08:39:56 +02:00
pwpiwi
9a573554e0
minor bugfix and enhancement to hf 14a reader
...
- "SAK incorrectly claims ... " message was displayed incorrectly
- now decodes FSCI, SFGI, FWI and displays FSC, SFGT, FWT resp.
2014-07-15 08:35:27 +02:00
pwpiwi
1604d0a290
Merge branch 'master' of https://github.com/Proxmark/proxmark3
2014-07-01 07:09:21 +02:00
Martin Holst Swende
9e28ee9f14
Only documentation and minor changes
2014-06-30 11:23:14 +02:00
pwpiwi
19d6d91fd5
hf 14a reader enhancement
...
In order to be able to distinguish between Mifare Classic and Mifare Plus
in Security Level 1 (SL1, Mifare Classic Compatibility Mode), hf 14a reader
now always tries RATS - even if SAK claims not to support ISO14443-4.
2014-06-30 08:21:50 +02:00
Martin Holst Swende
9b82de75f4
more work towards iclass elite dumping.. not quite finished yet though :(
2014-06-30 00:20:40 +02:00
Martin Holst Swende
aa41c6058a
Merged two iclass-reader functions into one to remove duplicated code, update loclass library with hash2 algo
2014-06-29 23:34:24 +02:00
Midnitesnake
74a3880283
Changes inorder for iclass dump to work correctly
2014-06-29 09:25:31 +01:00
Martin Holst Swende
26c0d833ac
Some minor changes [iclass-related]
2014-06-28 22:57:48 +02:00
Martin Holst Swende
3ad48540d4
Merge branch 'iclass-research' of https://github.com/PenturaLabs/proxmark3 into PenturaLabs-iclass-research
...
Conflicts:
README.txt
armsrc/apps.h
client/Makefile
client/cmdhficlass.c
client/cmdhficlass.h
2014-06-28 20:52:37 +02:00
Martin Holst Swende
42f57e0294
Merged with master
2014-06-27 13:16:31 +02:00
Martin Holst Swende
77abe781af
fix for better csns
2014-06-27 12:52:28 +02:00
pwpiwi
72b1090acf
Bugfixes:
...
- Byteorder was wrong when displaying ATQA in hf 14a read
- 7 Byte UIDs were truncated to 4 Bytes when displaying in hf 14a cuids
2014-06-26 07:57:49 +02:00
iZsh
b014c96d68
new command "lf snoop" to snoop raw ADC values
...
fpga/lo_read.v (lf_field): new argument.
fpga/fpga_lf.v: modify accordingly.
armsrc/apps.h (FPGA_MAJOR_MODE_LF_READER): Rename as FPGA_MAJOR_MODE_LF_ADC.
armsrc/apps.h (FPGA_LF_ADC_READER_FIELD): New LF option.
armsrc/lfops.c: Modify accordingly.
client/cmdlf.c (CmdLFSnoop): New command.
armsrc/appmain.c, armsrc/lfops.c, client/cmdlf.h, include/usb_cmd.h: Modify accordingly.
2014-06-21 21:33:54 +02:00
iZsh
7cc204bff8
THIS REQUIRES A BOOTROM UPDATE!! To save FPGA area, split the LF and HF bitstreams and load them on-demand.
2014-06-20 01:02:59 +02:00
penturalabs
fecd8202a5
implemented 'hf iclass dump xxxx',
...
all you need is the magic key to dump contents of an iclass card
2014-06-17 10:55:37 +01:00
Martin Holst Swende
9f6e9d1575
More work on iclass simulation attack
2014-06-16 21:27:12 +02:00
Martin Holst Swende
d51b2eda8f
Added enios dirthreshold command, patch from http://www.proxmark.org/forum/viewtopic.php?pid=11577#p11577
2014-06-11 08:42:37 +02:00
penturalabs
fe53c0311c
improved calc_iclass_mac to work independant of size
2014-05-02 23:30:03 +01:00
Andrew Davies
a66fca86b9
Updated proxmark research with Holiman's loclass framework
2014-05-02 11:11:54 +01:00
Martin Holst Swende
f83cc12613
More work on iclass
2014-04-24 15:48:00 +02:00
Martin Holst Swende
17cba2693d
Implemented client side changes for iclass hack, attempted to fix issues with trace. The trace functionality from iso14443 has been rewritten, unfortunately iclass used that also, which made iclass 'list' stop functioning, both for simulation and snooping
2014-04-24 14:13:33 +02:00
penturalabs
c3963755b7
Implement replay command.
2014-04-15 11:47:01 +01:00
Martin Holst Swende
07976a256d
Refactoring low frequency operations, now 'lf hid fskdemod' is more stable. Also did changes to handling ioprox tags, this is yet untested, so until it's been tested it should be kept off 'stable' branch
2014-03-31 17:57:14 +02:00
Philippe Teuwen
19e2a10de5
Markdown help: use fixed column width
2014-03-27 16:49:37 +01:00
Philippe Teuwen
46782176fc
Restore original inline help behavior as we've now separate fcts for -h/-m
2014-03-26 23:51:22 +01:00
Philippe Teuwen
dec8e8bd9f
Provide option -m for markdown help dump, -h for text dump
2014-03-26 23:50:34 +01:00
Philippe Teuwen
6f5dd6010e
Fix description in help dump
2014-03-26 22:44:25 +01:00
Philippe Teuwen
b5727175c0
Fix offline column in help dump
2014-03-26 22:40:41 +01:00
Martin Holst Swende
57c695563f
Fixes to implement generation of markdown auto-generated documentation
2014-03-26 22:39:37 +01:00
Philippe Teuwen
ae7aa73dd5
Add option -h to dump complete set of supported commands
...
Usage: ./proxmark3 -h
Display both offline & online commands, online commands are flagged.
git-svn-id: https://proxmark3.googlecode.com/svn/trunk@850 ef4ab9da-24cd-11de-8aaa-f3a34680c41f
2014-03-26 22:33:11 +01:00
holiman
f5a1a9ce47
Merge pull request #8 from pwpiwi/master
...
add .gitignore and merge svn r852
2014-03-25 21:49:05 +01:00
pwpiwi
d714d3effc
Improvements/Fixes to 14443 sniffing/snooping
...
- fixed a circular buffer rollover bug in iso14443a.c
- fixed 7 Byte UID handling in hf mf sniff
- fixed "cannot append" error in hf mf sniff d
- fixed hint on mfkey32 in hf mf sim x
- fixed hf mf sniff sometimes showing rogue data from previous calloc
- improve snooping/sniffing by syncing modulation detector window with reader signal (hi_iso14443a.v)
- code cleanup of hi_iso14443a.v
2014-03-25 21:38:24 +01:00
W8M2Hg9lLmWqXSGC
88c637e6cd
Merge pull request #7 from PenturaLabs/master
...
Re-submitting Midnitesnake's Mifare Ultralight Patch
2014-03-25 07:07:48 +11:00
W8M2Hg9lLmWqXSGC
347dea669a
Merge pull request #5 from PenturaLabs/master
...
Kantech ioProx Support - Fix
2014-03-21 20:35:14 +11:00
PenturaLabs
94faa59465
Update cmdlfio.h
2014-03-21 07:51:51 +00:00
penturalabs
c86220246e
Sorry, included missing files from last pull request
2014-03-21 07:45:18 +00:00
W8M2Hg9lLmWqXSGC
cf608ac8f3
Merge pull request #2 from PenturaLabs/master
...
Added Kantech ioProx Support
2014-03-19 08:47:28 +11:00
penturalabs
a1f3bb120f
Added Kantech ioProx Support
2014-03-18 20:52:48 +00:00
PenturaLabs
1801456ede
Re-submitting Midnitesnake's Mifare Ultralight Patch
2014-03-18 14:02:32 +00:00
midnitesnake
cb967ea976
Added Unique Code to EM41x
2014-03-18 07:42:54 +00:00
midnitesnake
080ff30a9e
Added Unique Code to EM41x
2014-03-18 07:41:02 +00:00
martin.holst@gmail.com
0c12504a5a
Patch submitted by 'FireFart', for some issues with 'hf mf chk'. See http://www.proxmark.org/forum/viewtopic.php?id=1888 for more info
2014-02-27 18:10:12 +00:00
micki.held@gmx.de
7bc95e2e43
- fixed iso1443a ManchesterDecoder in order to fix broken Snoop/Sniff
...
- enhanced tracing: hf 14a list now shows meaningful timing information. With new option f it also shows the frame delay times (fdt)
- small fix for hf 14b list - it used to run into the trace trailer
- hf 14a sim now obeys iso14443 timing (fdt of 1172 or 1234 resp.)
Note: you need to flash FPGA as well.
More details in http://www.proxmark.org/forum/viewtopic.php?pid=9721#p9721
2014-02-19 20:35:04 +00:00
martin.holst@gmail.com
d2f487af9c
Various improvements on the Mifare1kSimulation. Fixed issue with tracebuffer not being cleared, fixed issue with 'static' errors, added modes for doing reader-only attack, added interactive mode, added possibility to set UID from cmdline, either 7-byte or 4-byte. See http://www.proxmark.org/forum/viewtopic.php?id=1529 and http://www.proxmark.org/forum/viewtopic.php?id=1649&p=3 for some more background and discussion
2014-01-31 21:17:34 +00:00
micki.held@gmx.de
e691fc45bc
- improved reader sensitivity for 14443a cards (FPGA change!)
...
- implemented ISO 14443A anticollision loop
See http://www.proxmark.org/forum/viewtopic.php?id=1797 further details
2013-11-19 18:52:40 +00:00
martin.holst@gmail.com
6cacefa48d
Fixed issue with binary files in windows, http://www.lua.org/pil/21.2.2.html
2013-11-07 11:33:48 +00:00
martin.holst@gmail.com
4c367827b5
Fixed issue with binary files in windows, http://www.lua.org/pil/21.2.2.html
2013-11-07 11:32:13 +00:00
martin.holst@gmail.com
77cd612f15
Added a lua bit manipulation library, added Lua-api to iso 15693 crc-calculation
2013-11-06 18:34:10 +00:00
martin.holst@gmail.com
da9d456e9f
Minor fix, sometimes when data is sent without the pm3 is connected, it causes a spin-loop condition to occur which blocks the processor. fixed
2013-11-06 18:32:11 +00:00
martin.holst@gmail.com
b11542a7f6
Minor fix in html skeleton
2013-10-31 18:24:03 +00:00
martin.holst@gmail.com
e26df8425a
Some more tinkering with a generic 13.56MHz reader, still not finished
2013-10-31 10:35:03 +00:00
martin.holst@gmail.com
5198f2e23c
First steps towards creating a generic HF reader/identifier. A coop with Asper.
2013-10-30 21:10:47 +00:00
martin.holst@gmail.com
62a95012e9
Changed html template, in order to make it more generic and be usable on other types of data than mifare, now supports different highlighters. Implemented are NDEF and Mifare
2013-10-30 18:21:42 +00:00
dn337t@gmail.com
a00411152f
use CLOCKS_PER_SEC instead of platform-specific hardcoded value
2013-10-22 12:14:32 +00:00
martin.holst@gmail.com
412afdb87b
Fixed linebreak error
2013-10-20 19:05:52 +00:00
martin.holst@gmail.com
b3123cf603
Added functionality to dump data into .eml-file
2013-10-20 18:51:21 +00:00
martin.holst@gmail.com
db132ea0e8
Script to convert emulator file (ASCII dump of data) into HTML
2013-10-20 18:48:04 +00:00
martin.holst@gmail.com
c44241fdea
Fixed minor errors
2013-10-20 18:47:15 +00:00
izsh@fail0verflow.com
06b82e6a6d
cmdhf14b.c: fixing a crash in the crc computation when missing data (e.g. with 'hf 14b raw -c -p')
2013-10-20 11:46:51 +00:00
izsh@fail0verflow.com
3f7c993d78
fix compilation issues with gcc 4.6: anonymous unions are not c99
2013-10-20 11:40:00 +00:00
martin.holst@gmail.com
6742c089b1
Changes to how dumping is performed, now utilises a library. This is in preparation for a more generic dumping of different types of cards. Also added functionality to html-dump .eml-files
2013-10-19 20:18:50 +00:00
martin.holst@gmail.com
ba33066cef
Minor change
2013-10-18 11:35:06 +00:00
martin.holst@gmail.com
1686e4d1db
Added script to dump ndef-compliant tags. Written in collaboration with @asper
2013-10-18 11:14:23 +00:00
martin.holst@gmail.com
3c9ed0e180
Put manufacturer country within brackets
2013-10-18 07:36:20 +00:00
martin.holst@gmail.com
65e344df3e
Some refactoring, also placed wait14443a here
2013-10-17 19:21:04 +00:00
martin.holst@gmail.com
5eab31c336
Manufacturer-info, to be used in upcoming script
2013-10-17 19:20:10 +00:00
martin.holst@gmail.com
57d384004d
Changes to html-dump generateion, credits to en4rab http://www.proxmark.org/forum/viewtopic.php?pid=8576
2013-10-17 18:28:21 +00:00
roel@libnfc.org
981bd4292e
integrated MIFARE ultralight features, contributed by 'midnitesnake'
2013-10-11 08:43:23 +00:00
roel@libnfc.org
05f23c593c
with the declaration of 'uint8_t destination[8]', 'destination' is already a pointer, don't try to get the address of it by using '&destination', then you will get a pointer to a pointer.
2013-10-11 08:37:08 +00:00
martin.holst@gmail.com
51defdd4a2
Fixed issue where the 'nested'-part of autopwn only used 16 sectors, not bothering with the rest
2013-10-09 19:37:55 +00:00
martin.holst@gmail.com
b969713989
Fixed error with mifare_autopwn where keys were reversed, see http://www.proxmark.org/forum/viewtopic.php?pid=8494#p8494
2013-10-09 19:08:17 +00:00
roel@libnfc.org
b1231445c7
removed unused compiler directives, cleaned up some code
2013-10-09 09:59:14 +00:00
martin.holst@gmail.com
0dae56d81e
Committed mifare_autopwn.lua. For more infromation, see http://martin.swende.se/blog/Proxmark_Scripting_1.html and http://martin.swende.se/blog/Proxmark_Scripting_2.html
2013-10-08 18:50:54 +00:00
martin.holst@gmail.com
ed77aabe00
Patch from 'buzzy' to add automatic flushing of output, see http://www.proxmark.org/forum/viewtopic.php?id=1740 for more details.
2013-10-08 18:30:01 +00:00
martin.holst@gmail.com
2dcdf1a683
Added nonce2key-API to lua
2013-10-07 10:11:15 +00:00
martin.holst@gmail.com
7d2313912c
Fixed what may have been one cause of seg-faults in nonce2key... not sure, it still happens at times
2013-10-07 10:10:34 +00:00
martin.holst@gmail.com
e481bc3299
Removed double print-out
2013-10-07 10:02:25 +00:00
fnargwibble@gmail.com
e654346b79
i'm a retard. no idea why i did it that way! get rid of compile warnings, and print string properly. duh.
2013-10-05 16:55:53 +00:00
fnargwibble@gmail.com
e12b82d362
show device name during flashing and change advice on hanging
2013-10-05 16:44:48 +00:00
martin.holst@gmail.com
0a85b72549
Reworked how to call 'standard' stuff from within lua scripts, so now it's much simpler both in lines of code and usage. A script can now call core.console('hf mf nested 1 0 a ffffffffffff') in order to execute anything via the old command line parser
2013-10-04 19:29:46 +00:00
jonor@live.it
4f269f63da
Added more informations at command hw version. Now we can get some informations of microcontroller.
...
Maybe is useful when someone got a bigger AT91
Example:
#db# Prox/RFID mark3 RFID instrument
#db# bootrom: svn 756-unclean 2013-09-14 15:04:07
#db# os: svn 796-unclean 2013-10-04 18:50:44
#db# FPGA image built on 2013/ 9/26 at 9:17:32
uC: AT91SAM7S256 Rev B
Embedded Processor: ARM7TDMI
Nonvolatile Program Memory Size: 256K bytes
Second Nonvolatile Program Memory Size: None
Internal SRAM Size: 64K bytes
Architecture Identifier: AT91SAM7Sxx Series
Nonvolatile Program Memory Type: Embedded Flash Memory
2013-10-04 18:54:10 +00:00
martin.holst@gmail.com
6a2c1d8e14
Minor issue, usability
2013-10-04 18:47:38 +00:00
roel@libnfc.org
78e7cf984c
fixed some more compiler warnings
2013-10-03 14:52:21 +00:00
roel@libnfc.org
f66021cf48
fixed compiler warnings
2013-10-03 14:36:42 +00:00
martin.holst@gmail.com
2fca3ad92d
Some documentation improvement
2013-10-03 13:58:14 +00:00
martin.holst@gmail.com
c9e2f7807e
Added a utility script to convert a 'dumpdata.bin'-file into the 'eml'-format that the emulator uses. Did not find any built-in way to do this, perhaps such functionality already exists.. ?
2013-10-03 13:56:11 +00:00
martin.holst@gmail.com
acfdf9528b
Fixed error in htmldumper
2013-10-03 13:26:17 +00:00
martin.holst@gmail.com
61caacda2b
Added a utility which takes a mifare-dumpfile and creates a html-report visualising the data. The html-dump is self-sufficient and standalone .. part 2
2013-10-03 12:34:28 +00:00
martin.holst@gmail.com
d78792f515
Added a utility which takes a mifare-dumpfile and creates a html-report visualising the data. The html-dump is self-sufficient and standalone
2013-10-03 12:33:58 +00:00
martin.holst@gmail.com
05ed5c496a
Made script-based default key check a bit more intelligent, so it works not only on 4k cards. Also added option to save data to a dump-file
2013-10-01 19:58:42 +00:00
douniwan5788@gmail.com
b19bd5d689
Add support in 'hf mf mifare' for some unlicensed/compatible mifare card which always answer NACK.
...
Change the 'nttmp' start from nt distance 500 to 100 in mifarecmd.c to compatible some unlicensed/compatible mifare card.
2013-09-29 11:44:07 +00:00
martin.holst@gmail.com
686f0a1794
Moved script libraries into lualibs/folder, and added a patch to include the folder in the LUA_PATH (a.k.a package.path). See http://proxmark.org/forum/viewtopic.php?id=1750 for more details
2013-09-28 20:07:28 +00:00
martin.holst@gmail.com
5f6d6c9003
Raw 14a in commandline, patch by jonor, see http://proxmark.org/forum/viewtopic.php?id=1751 for more info
2013-09-28 19:28:55 +00:00
henryk@ploetzli.ch
bf7163bdb3
* Add an option to lf read command to use an arbitrary divisor, enabling reading at frequencies other than 125 and 134 kHz.
2013-09-27 13:48:20 +00:00
roel@libnfc.org
7bb9d33e2c
fixed warnings on Mac OS 10.8, xcode 5
2013-09-25 10:40:16 +00:00
martin.holst@gmail.com
450d2e3a96
Minor changes, usage examples and selftests
2013-09-21 20:46:32 +00:00
martin.holst@gmail.com
70c8077c99
Changed the name of writeraw into 14araw
2013-09-21 20:40:32 +00:00
martin.holst@gmail.com
b61f426c2d
Fixed the write raw 14a, now finally functional... at least let's hope so
2013-09-21 20:37:22 +00:00
martin.holst@gmail.com
427cdbe2cd
Fixed error from r769 where I added -ldl switch for linux, but still forgot to remove it for others...
2013-09-20 10:11:17 +00:00
martin.holst@gmail.com
24d48e60fc
Fix two errors in writeraw (14a)-script that were found by jonor
2013-09-20 07:32:37 +00:00
martin.holst@gmail.com
42daa759c1
Only superficial changes, to get rid of compiler warnings
2013-09-19 19:53:09 +00:00
martin.holst@gmail.com
eaea9de900
Removed the -ldl switch from r763, so it only is added for Linux (it apparently caused errors on windows/mingw)
2013-09-19 19:33:56 +00:00
martin.holst@gmail.com
30a5d35529
Implemented parameter passing into script, added a minimal getop-parser, added an example script which takes parameters
2013-09-19 19:21:12 +00:00
martin.holst@gmail.com
b13fa4448f
merged trunk changes into branch
2013-09-16 19:08:19 +00:00
martin.holst@gmail.com
a403a55959
In the middle of some work to get arguments into scripts. Also fixed so you don't have to specify .lua on 'script run foobar'
2013-09-16 19:04:29 +00:00
martin.holst@gmail.com
869cabf7dd
Patch by jonor for hf list 14b, wait of ack was missing. See http://www.proxmark.org/forum/viewtopic.php?pid=8260#p8260
2013-09-16 18:38:47 +00:00
micki.held@gmx.de
9492e0b098
Major rework of hf mf nested:
...
- PM: used GetCountMifare in MifareNested() for improved timing accuracy and to deliver better quality nonces
- PM: MifareNested now delivers exactly two different nonces to avoid time consuming multiple lfsr_recovery32() on client side
- Client: replaced quicksort by bucketsort in crapto1.c which is faster
- Client: use multithreading (two parallel calls to lfsr_recovery32())
- Client: fixed a small bug in mfnested() (always showed trgkey=0)
- Client: introduced a mutex for PrintAndLog() to avoid interlaced printing
Minor rework of hf mf chk:
- Avoid time consuming off/on cycles. Send a "halt" instead.
2013-09-15 09:33:17 +00:00
martin.holst@gmail.com
500c972914
Fixed some kind of of linking error
2013-09-01 20:22:22 +00:00
martin.holst@gmail.com
cda2a4c0a5
Merged latest trunk changes into scripting-branch
2013-09-01 20:00:56 +00:00
martin.holst@gmail.com
babfcaa0f3
Patch by jonor, fixes so uart_receive does not block when data is continuosly received. See http://www.proxmark.org/forum/viewtopic.php?id=1735
2013-09-01 18:46:55 +00:00
martin.holst@gmail.com
7cf3ef203c
Patch by jonor for raw ISO 1444B commands. See http://www.proxmark.org/forum/viewtopic.php?id=1729 for more info
2013-09-01 18:41:05 +00:00
martin.holst@gmail.com
a763eb2126
Added a comment
2013-09-01 18:40:08 +00:00
martin.holst@gmail.com
3e69b21148
Minor changes to writeraw.lua, still not working as it should
2013-08-27 06:50:00 +00:00
martin.holst@gmail.com
4961e292aa
More patches from en4rab to the hexsamples, plus patches to legicsave and legicdecode (also by en4rab).
2013-07-12 20:03:31 +00:00
micki.held@gmx.de
1d59cd8d7a
Revoked unintended commit of cmdmain.c to scripting branch in r754.
2013-07-10 05:10:58 +00:00
micki.held@gmx.de
1c611bbd26
2013-07-08 17:56:05 +00:00
micki.held@gmx.de
a361cddfb9
2013-07-08 17:56:05 +00:00
martin.holst@gmail.com
4df3eb3f73
Attempt to use raw writing capabilities via scripting engine. Not functional yet
2013-07-04 12:56:00 +00:00
martin.holst@gmail.com
e772353f72
Major changes to hf mf mifare
2013-06-26 21:13:02 +00:00
martin.holst@gmail.com
c6e2bfcda1
Removed some crap-scripts for testing
2013-06-26 20:49:04 +00:00
martin.holst@gmail.com
ca363c2348
Fixed so correct sizes are used across different architectures in the binlib
2013-06-26 12:33:31 +00:00
martin.holst@gmail.com
3a4c72fe59
Added lua-mac building, added cleaning of lua files
2013-06-26 11:02:37 +00:00
martin.holst@gmail.com
ea833d39ff
Improved error handling
2013-06-26 09:18:31 +00:00
martin.holst@gmail.com
30a46ed86a
Attempt to make the makefile generic, so lua compilation works well also under windows
2013-06-25 20:25:18 +00:00
martin.holst@gmail.com
529488e87d
typo
2013-06-07 19:51:15 +00:00
martin.holst@gmail.com
9f7a854d7b
Fixed a minor error with the keys
2013-06-07 18:58:06 +00:00
martin.holst@gmail.com
a2d82b467a
Added library to read card info, made use of it from within mfkeys.lua script
2013-06-07 13:23:32 +00:00
martin.holst@gmail.com
fd368d18f1
Changes in cmd handling
2013-06-07 09:30:32 +00:00
martin.holst@gmail.com
21452811e6
implementation of command library in lua
2013-06-07 09:27:58 +00:00
martin.holst@gmail.com
16b04cb291
mf check keys in lua-space
2013-06-07 09:26:56 +00:00
martin.holst@gmail.com
c00f0dbfda
Fixed 'volatile' error in this branch also
2013-06-07 09:25:59 +00:00
martin.holst@gmail.com
44fffc5451
Work on the scripting library
2013-06-07 09:24:25 +00:00
martin.holst@gmail.com
1bad971361
Fixed so storeCommand/getCommand are multithread-safe (at least dual-thread). Hopefully. http://www.proxmark.org/forum/viewtopic.php?pid=7400#p7400
2013-06-06 18:30:00 +00:00
martin.holst@gmail.com
c338502409
Applied patch from http://www.proxmark.org/forum/viewtopic.php?id=1637 , where a compiler optimization resulted in hangs
2013-06-05 08:53:20 +00:00
martin.holst@gmail.com
ab7a8ea164
Fixed error pointed out here: https://code.google.com/p/proxmark3/issues/detail?id=46 , when null is passed to waitforresponse
2013-06-03 11:04:35 +00:00
martin.holst@gmail.com
a808a224f5
Found that USBcommands from the device are silently overwritten if the host does not quickly enough read them, which causes problems in several places. Implemented a circular buffer which stores up to 50 commands (still tiny, memorywise) and prints out a message if the buffer wraps around (overwrites).
2013-05-31 19:25:13 +00:00
martin.holst@gmail.com
f057bddb70
Added binlib, to handle binary data from lua, based on lpack http://www.tecgraf.puc-rio.br/~lhf/ftp/lua/#lpack
2013-05-26 20:05:13 +00:00
martin.holst@gmail.com
3510cdff4b
Started an experiment with lua mifare hack
2013-05-24 21:43:02 +00:00
martin.holst@gmail.com
96e7a3a50b
Minor fixes, added some functionality to send data, but still some way to go
2013-05-24 21:39:08 +00:00
martin.holst@gmail.com
5b760b6cac
'core' library glue
2013-05-24 21:06:57 +00:00
martin.holst@gmail.com
1ef665776d
Added a PoC script which implements a commandline
2013-05-24 21:06:20 +00:00
martin.holst@gmail.com
a0655c45bd
Added 'core'-api, also added some error handling in scripts
2013-05-24 21:05:45 +00:00
martin.holst@gmail.com
5a92cb525e
Fixed so standard libraries can be used, added an example script, and fixed so all hf.mf-ops can be called
2013-05-22 13:04:01 +00:00
martin.holst@gmail.com
806dc07542
First implementation of user scripts - very experimental - YMMV
2013-05-21 18:37:43 +00:00
martin.holst@gmail.com
489e174541
Fixed problem with em4100, see http://www.proxmark.org/forum/viewtopic.php?pid=7235#p7235
2013-05-16 18:13:54 +00:00
apresence@gmail.com
e67b06b706
Support for cloning to T55x7 at different clock rates & 134KHz
...
* Modified commands (lf em4x):
em410xwatch ['h'] -- Watches for EM410x 125/134 kHz tags (option 'h' for 134)
em410xwrite <UID> <'0' T5555> <'1' T55x7> [clock rate] -- Write EM410x UID to T5555(Q5) or T55x7 tag, optionally setting clock rate
* Better option checking for em410xwrite & fix for uninitialized vars
* Increased samples from 2000 to 4000 in em410xwatch (2000 is OK for clock=64, but too few for clock=32)
2013-05-12 08:11:00 +00:00
martin.holst@gmail.com
5b59cfb7b1
Added some information about flashing (linux)
2013-05-11 12:43:44 +00:00
martin.holst@gmail.com
5f91a683b7
Added some documentation regarding ports on linux
2013-05-11 12:33:04 +00:00
roel@libnfc.org
90d74dc206
next update from en4rab on data samples
2013-04-26 20:33:05 +00:00
roel@libnfc.org
a2847518d2
en4rab fixed the 'data samples' command
2013-04-23 19:55:43 +00:00
roel@libnfc.org
6c6d1ac1a6
fixed signed/unsigned problem
2013-03-26 20:42:18 +00:00
roel@libnfc.org
4890730a5f
fixed crash, when proxmark was claimed by other process
2013-03-26 16:01:52 +00:00
roel@libnfc.org
62ee4fedd5
Finally figured out a way to claim a serial port interface under unix
2013-03-22 16:42:26 +00:00
roel@libnfc.org
4a049b7847
avoid rolling dots over the screen when proxmark is not available (yet)
2013-03-21 16:06:09 +00:00
roel@libnfc.org
d8193fa5ac
flasher updated again, should work more solid now
2013-03-21 12:44:21 +00:00
roel@libnfc.org
2d7fc168a2
fixed missing header file
2013-03-21 11:38:48 +00:00
roel@libnfc.org
13dbdd6bb1
(dirty) fix for linux to clean up the /dev/ttyACM* quicker
2013-03-21 10:59:56 +00:00
roel@libnfc.org
0a24369c48
trying to tweak uart code, for better flashing
2013-03-19 16:19:20 +00:00
roel@libnfc.org
759c16b31f
client should compile without warnings on linux, mac, windows
2013-03-14 15:03:04 +00:00
roel@libnfc.org
19d9a7b0ce
fixed compiling under ubuntu with devkitARM_r41
2013-03-13 13:46:40 +00:00
cex123@gmail.com
38b20f7550
Fixed LF HID cloning command
2013-03-13 07:13:19 +00:00
roel@libnfc.org
47e18126ec
added hitag bit count output in log
2013-03-11 15:07:23 +00:00
roel@libnfc.org
d16d20b1fb
fixed CMD_HID_SIM_TAG
2013-03-10 11:37:59 +00:00
roel@libnfc.org
c1e745e465
optimized
2013-03-04 15:15:30 +00:00
thijsbreman@gmail.com
a7b4bf1eb4
polling per second in OpenProxmark
2013-03-04 13:07:15 +00:00
roel@libnfc.org
829fb342b5
uploaded new mingw-proxmark.zip, QT working again, so re-enabled QUI under windows
2013-03-01 14:28:14 +00:00
roel@libnfc.org
9d8f56e35d
fixed stupid 64-bit formatting for x86/amd64 and unix/windows - part4
2013-02-28 22:49:34 +00:00
roel@libnfc.org
a0bbdb76ca
fixed stupid 64-bit formatting for x86/amd64 and unix/windows - part3
2013-02-28 22:46:49 +00:00
roel@libnfc.org
1a07fd510d
fixed stupid 64-bit formatting for x86/amd64 and unix/windows - part2
2013-02-28 22:33:31 +00:00
roel@libnfc.org
125a98a110
fixed stupid 64-bit formatting for x86/amd64 and unix/windows
2013-02-28 22:22:24 +00:00
roel@libnfc.org
cb64309e4b
compiling on windows again
2013-02-28 21:36:09 +00:00
roel@libnfc.org
54a942b05d
merged all patches into CDC repository
2013-02-28 17:04:23 +00:00
roel@libnfc.org
50d6e4abc1
douniwan5788:
2013-02-28 16:04:21 +00:00
roel@libnfc.org
28fdb04fd8
Finally, rewrote bootrom and flasher program, much faster now
2013-02-28 15:11:52 +00:00
roel@libnfc.org
79a73ab2d1
fixed USB GPIO bug reported by gregy, and fixed 'hf 14a reader' command
2013-02-27 13:23:38 +00:00
roel@libnfc.org
ab4da50d99
added automatically saving the hitag2 memory content to file
2012-12-09 21:25:29 +00:00
roel@libnfc.org
9440213d6b
fixed 64-bit cmd/arg for windows
2012-12-09 13:00:19 +00:00
roel@libnfc.org
7dd1908b24
fixed 'hf mf' command and some others
2012-12-07 22:37:22 +00:00
roel@libnfc.org
fe7bfa7856
Windows7 working now! ugly fix for inaccurate Windows timer, quickfix for receiving multiple frames
2012-12-07 12:51:19 +00:00
roel@libnfc.org
f0ba634221
receiving/sending moved to one thread
2012-12-07 12:22:05 +00:00
roel@libnfc.org
985ef1c315
temporarely disabled QT for winows, no clue why it gives a failure
2012-12-07 11:01:55 +00:00
roel@libnfc.org
1282b0e691
minor output change
2012-12-07 09:51:22 +00:00
roel@libnfc.org
af65f5f71d
fixed read uart for windows
2012-12-07 07:21:00 +00:00
roel@libnfc.org
d0b14ad5e7
fixed missing header
2012-12-06 22:17:27 +00:00
roel@libnfc.org
ecab772ed0
added missing files, part2
2012-12-04 23:43:19 +00:00
roel@libnfc.org
5bcc76c427
added missing files
2012-12-04 23:41:54 +00:00
roel@libnfc.org
902cb3c00b
major USB update
2012-12-04 23:39:18 +00:00
Merlokbr@gmail.com
bfaecce6eb
there was bug in hf mf mifare
. and speed up this command.
2012-11-08 09:48:02 +00:00
thijsbreman@gmail.com
219a334de5
added: readed blocks (password mode) into tag.sectors[]. 'lf hitag sim' simulates the readed blocks.
2012-10-18 10:01:13 +00:00
roel@libnfc.org
bde10a5057
added hitag2 reading in crypto mode functionality
2012-10-16 15:18:13 +00:00
thijsbreman@gmail.com
2d495a814d
Added output to file for 'lf hitag list' command
2012-10-03 12:30:20 +00:00
roel@libnfc.org
8de6b69d1e
added 'hitag2.ht2' binary example image for emulation
2012-09-18 13:56:23 +00:00
roel@libnfc.org
db09cb3adb
MAJOR update, added hitag2 reader, emulation and eavesdropping, lots of new code, including FPGA tweaks
2012-09-18 13:52:50 +00:00
frederikmoellers@aol.de
69f8a37be0
Allow user to specify a delay
...
The user may specify a delay between PACE nonce requests. Using no delay between subsequent issues of the USB command may lead to errors in the USB communication.
Until test results show that the delay can be fixed or left out completely the user has to test what value is safe to use.
This fixes errors "Read only 40 instead of requested 64 bytes!" (if the correct delay is used, e.g. 3 seconds for 16 byte nonces).
2012-08-28 22:45:34 +00:00
frederikmoellers@aol.de
5acd09bdfb
Basic support for EAC documents (e.g. German Identification Card)
...
-new files armsrc/epa.[ch] for ePA (electronic "Personalausweis") related functions
-Offers elementary functions (EPA_PACE_MSE_Set_AT etc.)
-Also offers one new USB command: EPA_PACE_Collect_Nonce
-created new command subtree in client: client/hfepa.[ch] ("hf epa")
-offers "hf epa cnonces" (collect encrypted PACE nonces)
-more to come
2012-08-28 21:39:50 +00:00
frederikmoellers@aol.de
db22dfe6ff
-Added .history to the svn:ignore property
...
-Added "hf 14a cuids" command to collect multiple ISO14443-A UIDs from one card in a batch
-The command takes one parameter (the number of UIDs to collect)
-This can be useful to analyze the RNGs of cards that generate random UIDs (e.g. MRTDs)
2012-08-14 14:56:09 +00:00
dn337t@gmail.com
e50d95165c
removed dead check of uint8_t > 255
2012-08-13 19:52:22 +00:00
dn337t@gmail.com
561f7c11ef
added dissector for ISO 14443-A ATS response
2012-07-25 16:19:56 +00:00
dn337t@gmail.com
14006804dd
added util.h include to avoid implicit function declaration
2012-07-20 09:06:55 +00:00
dn337t@gmail.com
eede7162bc
commented set but unread variable wantSaveToEml
2012-07-20 09:04:23 +00:00
Merlokbr@gmail.com
71d90e54cd
hf mf sniff
transfered parity from arm to decoding procedure
2012-07-17 15:19:15 +00:00
Merlokbr@gmail.com
8b6a93df91
hf mf sniff
added CRC_14443_A check
2012-07-17 11:41:56 +00:00
Merlokbr@gmail.com
c948cbde8c
small fix
2012-07-17 11:29:34 +00:00
Merlokbr@gmail.com
e0c635d19c
hf mf sniff
- working with emulator files
2012-07-17 11:28:12 +00:00
Merlokbr@gmail.com
55acbb2a39
improved command hf mf sniff. Now it cant decode nested authentication and cant write emulator files
2012-07-16 14:49:51 +00:00
Merlokbr@gmail.com
39864b0bd4
"hf mf sniff" low level logics works.
2012-07-11 15:52:33 +00:00
t0m4.null@gmail.com
ec56429002
Fixed writing em410x 40bits UID on T5555/T55x7 tags on 32bits systems
2012-07-10 17:52:17 +00:00
Merlokbr@gmail.com
5cd9ec01e0
hf 14a snoop optimized and added parameters. hf 14a sniff - not work.
2012-07-07 15:29:51 +00:00
Merlokbr@gmail.com
b62a5a8444
small improvements, added new command hf mf sniff
(there will be cool sniffer). But now... here is optimized hf 14a snoop. As I see it works the same as th old version.
2012-07-06 16:19:05 +00:00
douniwan5788
ac14bee321
Fixed auto nt bug
2012-07-06 13:44:37 +00:00
Merlokbr@gmail.com
8784cd1aee
fixed setting block0 for "magic card". now it works)
2012-07-06 10:00:44 +00:00
Merlokbr@gmail.com
545a1f385c
another "magic card" backdoor - command "read block". Added several commands to manipulate card data.
2012-07-05 14:05:01 +00:00
Merlokbr@gmail.com
208a0166b9
magic Chinese card fully supported. Added commands:csetuid-set card uid and wipe it, csetblk-set 16 byte block, cload-load dump from emulator memory or emulator file
2012-07-05 10:59:15 +00:00
Merlokbr@gmail.com
f774db9598
added magic card write block
2012-07-05 08:09:41 +00:00
Merlokbr@gmail.com
0675f200e6
Added work with "magic Chinese" card (card from: ouyangweidaxian@live.cn) with wipe support). Change UID and wipe only.
2012-07-05 07:31:56 +00:00
cex123@gmail.com
2414f97889
Added Indala cloning. Fixed HID cloning bug
2012-07-02 08:37:50 +00:00
roel@libnfc.org
81cd0474cb
fixed a lot of simulation issues
2012-06-29 10:24:05 +00:00
dekoninggans@gmail.com
1e26214152
Extended iClass support with Card and Reader emulation!
2012-06-28 13:38:40 +00:00
dn337t@gmail.com
70049c47db
refactored client/pm3_*.py to use with statements, contants and iterators
2012-06-22 12:02:19 +00:00
dn337t@gmail.com
0aceafbf2e
added simple test suite for client/pm3_*.py
2012-06-22 11:51:59 +00:00
dn337t@gmail.com
11d2326425
made clients/pm3_*.py importable as Python modules
2012-06-22 11:09:36 +00:00
adrian@atrox.at
0546b4aaf7
added more cards to iso15693 uid database, and some minor cleanups
2012-06-20 17:15:21 +00:00
dn337t@gmail.com
cee48e2b44
initialize graph cursors to avoid crashing (issue 21)
2012-06-07 14:00:41 +00:00
dn337t@gmail.com
836138032c
use char instead of uint8_t to avoid warnings/casting
2012-06-07 09:24:49 +00:00
douniwan5788
99a71a0d01
replaced the getline which does't support by minGW on windows
2012-05-31 09:46:02 +00:00
douniwan5788
aea4d76687
Enhanced hf mf chk , add default key,support dic file and so on.
...
modify hf mf mifare to automatically use an invalid key'nt try again.
make some changes to support mifare classic 4k.
2012-05-30 03:45:55 +00:00
dn337t@gmail.com
7853775ee2
added CmdHF15CmdReadmulti using Adrian's second patch from issue 20
2012-05-29 12:31:29 +00:00
dn337t@gmail.com
65a23af22b
textual changes: error messages and comments by Andrian + attribution
2012-05-29 12:22:08 +00:00
dn337t@gmail.com
05151b6fe8
added head comments on CmdHF15Cmd{Read,Write} using Adrian's second patch from issue 20
2012-05-29 12:17:24 +00:00
dn337t@gmail.com
eba61a5647
clarification in 'hf 15 cmd write' message using Adrian's second patch from issue 20
2012-05-29 12:12:00 +00:00