marshmellow42
6ac4cb270a
minor fixes
...
see @icemant1001 -
0ad1a1d492
for more details
2015-06-15 00:44:57 -04:00
marshmellow42
954767dd95
added iceman1001 s latest reveng script version
2015-06-15 00:23:58 -04:00
marshmellow42
d679c29a4f
@iceman1001 s compiler warning adjustment
2015-06-15 00:22:49 -04:00
marshmellow42
b43607e995
add reveng compile directory
2015-06-15 00:09:28 -04:00
marshmellow42
cf9aa77db0
remove commented out code from testing
...
also put back CMD_BUFFER_SIZE as I didn't need to change it in the first
place..
2015-06-15 00:03:16 -04:00
marshmellow42
9c823c1c87
comment change in config.h
...
this line indicates potential platform compatibility issues
2015-06-14 17:48:06 -04:00
Martin Holst Swende
26fbe1fbd9
Merge pull request #117 from marshmellow42/master
...
askbiphase bug fix
2015-06-14 19:32:36 +02:00
marshmellow42
fd227f4e7d
add comment
2015-06-14 11:11:00 -04:00
marshmellow42
c7d6721290
bug fix. askdemod edits invert pointer, cannot be 0
2015-06-14 10:54:55 -04:00
Martin Holst Swende
0f5b97d92c
Merge pull request #115 from marshmellow42/master
...
add-ons and bug fixes
2015-06-14 09:02:13 +02:00
marshmellow42
330f65fbaf
undo ARC rename, bug was fixed in scripting.c earlier
2015-06-11 23:09:15 -04:00
marshmellow42
5afe9838eb
fix reveng CRC-16 bug
2015-06-10 11:01:01 -04:00
marshmellow42
d2219cae51
reveng -g (model search given just hexstr with crc)
2015-06-10 01:33:37 -04:00
marshmellow42
53ee28cb3a
reveng- iceman1001 s scripting updates
2015-06-09 21:21:51 -04:00
marshmellow42
2e16354693
fix reveng memory bug + @iceman1001 s scripting
2015-06-09 13:40:01 -04:00
marshmellow42
7a23fca13a
reveng RunModel - add endian switches
2015-06-08 23:14:11 -04:00
marshmellow42
37f4270a24
reveng add api RunModel
2015-06-08 21:22:18 -04:00
marshmellow42
2d3c535ec9
fixed bug in util getpraram8 + reveng adjustments
...
reveng:
fixed error handling some.
added -s option to GetModels()
2015-06-08 13:37:22 -04:00
marshmellow42
7e59994713
begin reveng add-ons for lua
2015-06-08 12:25:50 -04:00
marshmellow42
8e2e6c8eb0
add clock to ask rawdemod outputs
...
fix biphase invert bug (correctly)
2015-06-07 00:42:57 -04:00
marshmellow42
f46c366321
Fix reveng
2015-06-07 00:10:54 -04:00
marshmellow42
fe81b47811
add reveng-1.30
...
new command menu:
crc help
crc calc
crc calc -h for help on command set
2015-06-06 01:09:54 -04:00
marshmellow42
07b5a3c3ba
Modified kermit crc to use existing crc calc code
2015-06-05 22:39:56 -04:00
marshmellow42
c2c7f6c271
fdx-b clean up
2015-06-04 13:10:33 -04:00
marshmellow42
6eaa8da9dc
Add CCITT Kermit CRC check for FDX-B demod
2015-06-04 12:53:19 -04:00
marshmellow42
cf4d3e21b0
add fdx-b to cmddata.h
2015-06-04 00:05:37 -04:00
marshmellow42
ecfcb34cc5
add fdx-b to lf search
2015-06-04 00:04:49 -04:00
marshmellow42
b2c330b367
bug fix - biphase invert + fdx-b adjustments
2015-06-03 23:59:22 -04:00
marshmellow42
fd1d30cb76
addition animal tags demod info
2015-06-03 18:28:56 -04:00
marshmellow42
04bb05670d
Testing animal tags
2015-06-03 16:52:20 -04:00
Martin Holst Swende
6a2e5adffd
Merge pull request #108 from p-l-/fix-hf-mf-csave
...
Ported hf mf esave trick for unreadable UIDs to hf mf csave
2015-06-01 19:57:57 +02:00
marshmellow42
4a74e2be72
add my_d move lean identification.
2015-06-01 00:18:03 -04:00
marshmellow42
be290d68bd
new lua script from @iceman1001 + bug fix in hf mfu
2015-05-31 16:08:58 -04:00
pwpiwi
97a0f5f4aa
fix format strings for nit picking compilers
2015-05-31 19:51:44 +02:00
marshmellow42
1c4c0b0681
add @Iceman1001 s sha1 scripting changes.
2015-05-30 21:51:15 -04:00
pwpiwi
dc20a1f639
Fix linking under linux. liblua requires libld on linux.
2015-05-29 18:18:10 +02:00
marshmellow42
185e038c7d
fixed further typo in lf t5 wr help
...
also fixed offset option char to uint8_t warning in the new offset
option in data printdemodbuffer
2015-05-28 23:14:06 -04:00
marshmellow42
5b37e87a24
fix help typo
2015-05-28 22:52:41 -04:00
marshmellow42
979bba376d
add offset option to data printdemodbuffer
...
easily see demod buffer's hex values at different bit offsets by using:
data printdemodbuffer x o <offset>
2015-05-28 13:23:31 -04:00
pwpiwi
fbd0526b34
delete (yet) unnecessary file client/cmdhftopaz.c
2015-05-28 02:55:57 +02:00
marshmellow42
4973f23d3c
clean up mfu device side code
...
+ add xor calc to util (prep for desfire)
commented out MifareUWriteBlockCompat as it isn't used in client
currently (it is a command we could support.. but why?)
relabeled a few device side mfu functions to be clearer.
2015-05-27 12:24:13 -04:00
marshmellow42
dcbaa2b582
@iceman1001 s lua script fix
2015-05-26 20:31:07 -04:00
pwpiwi
8e074056ac
also delete *.bin and fpga_compressor when "make clean".
...
Add target to make fpga_compressor when client is not yet compiled.
Get version information and cache it when client starts (avoids clearing
BigBuf when calling hw version).
Add some comments and remove debugging printouts.
Add version info and ChangeLog in modified zlib.
2015-05-26 18:12:40 +02:00
marshmellow42
22342f6dfe
Add clearCommandBuffer before SendCommand
...
adjust output of mfu rdbl to be consistent
fix output of mfu dump in case startPage was specified. (also was
missing "i" in second print...)
2015-05-26 10:40:23 -04:00
pwpiwi
4b3f6d79ea
Add option -d (decompress) to fpga_compress. Allows testing.
...
Improve zlib deflate (note: no change required to inflate).
2015-05-26 08:31:35 +02:00
pwpiwi
0fa01ec7da
Compress the .data section as well (saves another 4KBytes and comes for free)
...
zlib tuning: prevent fpga_compress from generating fixed code blocks
armsrc/Makefile: replace osimage with fullimage
2015-05-26 08:31:32 +02:00
pwpiwi
fb22897415
fpga_compress: interleave (combine) fpga_lf.bit and fpga_hf.bit before compression.
...
fpga_loader.c: change to unweave fpga_lf and fpga_hf accordingly
prepare fpga_compress, fpga_loader and Makefile to handle more than two FPGA config files
revert removal of fullimage Makefile target. Remove osimage instead.
2015-05-26 08:31:28 +02:00
pwpiwi
f39198789b
replaced gzip with an own compressor tool (fpga_compress.c, based on zlib)
...
This allows to remove the gzip header support and the z_crc32.[ch] files
(which saves more than 2KBytes of the ARM's flash memory)
2015-05-26 08:31:26 +02:00
pwpiwi
e61530408c
add: hw ver: show FPGA versions for both HF and LF FPGA configs
...
add: hw ver: show used and free flash memory
chg: prepare fpgaloader for compressed FPGA configs
2015-05-26 08:31:19 +02:00
Pierre LALET
1d537ad65c
Ported hf mf esave trick for unreadable UIDs to hf mf csave
...
Thanks: iceman1001
2015-05-25 11:47:27 +02:00
marshmellow42
e406dd5cc9
Merge remote-tracking branch 'upstream/master'
2015-05-24 22:31:13 -04:00
marshmellow42
79d7bcbb51
updated mfu rdbl and wrbl commands
...
@iceman1001 s rdbl and wrbl cmd updates.
dump screen output adjusted
2015-05-24 22:28:21 -04:00
Pierre LALET
292fe72535
Fix filenames for hf mf cload / csave
2015-05-24 22:43:08 +02:00
Pierre LALET
0b14440dce
Fix filenames for hf mf esave / eload
2015-05-24 20:14:22 +02:00
marshmellow42
0ce03d9ab0
fix mfu dump getbigbuffer bug
...
Thanks @iceman1001 for catching my oops, and fixing it :)
2015-05-23 22:35:50 -04:00
marshmellow42
012c0761bd
hf mfu minor output adjustments
...
dump key placed properly for EV1 and NTAGs
config pages for ntags corrected in printout
note on config that PWD and PACK cannot
actually be read from memory (probably could just delete them (other
than it shows what memory block they are stored in for changing...)
2015-05-22 13:17:51 -04:00
marshmellow42
8f2e50b4c5
mfu info authkeyptr fix
...
didn't follow @iceman1001 s l parameter changes fully... fixed now..
:)
2015-05-22 07:29:18 -04:00
marshmellow42
06561c34ef
fix to dump cmd print keys.
...
add l option to info cmd.
add ascii print to dump (screen only)
other minor clean up
2015-05-22 00:15:57 -04:00
marshmellow42
efd193519c
hf mfu bug fixes, and help text fixes
2015-05-21 11:17:01 -04:00
marshmellow42
1c429594a1
further mfu info updates
...
needed to auth select when a command failed for locked tags.
some output cleanups from @iceman1001
2015-05-20 16:47:40 -04:00
marshmellow42
cd87ee9133
finish NTAG i2c +...
...
thanks iceman
2015-05-20 15:42:58 -04:00
marshmellow42
46fcd738e0
finish NTAG i2c +...
...
thanks @iceman1001
2015-05-20 15:41:48 -04:00
marshmellow42
8241872c47
ULEV1_48 had the wrong max block
2015-05-20 14:22:26 -04:00
marshmellow42
ea11861793
minor adjustments to hf mfu
2015-05-20 14:17:43 -04:00
marshmellow42
c7442b7673
Add NTAG i2c and bug fix
...
also streamlined select tag code
2015-05-20 14:06:46 -04:00
marshmellow42
a383f4b708
Add ntag 210, 212, 203 and bug fix
2015-05-20 11:27:44 -04:00
marshmellow42
29250969b0
@iceman1001 s comments/updates mfu cmds
2015-05-18 22:07:11 -04:00
marshmellow42
9d87eb6650
MF ultralight code cleanup
2015-05-18 13:11:00 -04:00
marshmellow42
8258f40969
Iceman1001 s MFU clean up
...
cleaned up MF UL_C auth code device side.
2015-05-17 20:49:25 -04:00
marshmellow42
cceabb79e6
mfu info / dump attempt at missing auths
...
NOT TESTED. will test soon. probably has bugs!
2015-05-16 01:00:31 -04:00
marshmellow42
ae8303c13c
mfu dump - beginning of additions
2015-05-15 01:19:58 -04:00
marshmellow42
5b99376a8f
hf mfu dump testing
2015-05-15 00:57:51 -04:00
marshmellow42
93737008ee
@iceman1001 s default keys
2015-05-14 22:55:18 -04:00
marshmellow42
9ccfb3a8bc
@iceman1001 's updated lualibs
2015-05-13 21:36:20 -04:00
marshmellow42
ab7fdfcbed
@iceman1001 updated scripts
2015-05-13 21:20:23 -04:00
marshmellow42
d730878d8c
scripting updates from @iceman1001
...
it compiles but i'm not sure how to fully test it...
:)
2015-05-13 21:14:35 -04:00
marshmellow42
6fdf42c61c
minor hf mfu info adjustment from @iceman1001
2015-05-13 11:22:27 -04:00
marshmellow42
e6432f0579
@iceman1001 s coverity scan fixes
2015-05-13 11:14:17 -04:00
marshmellow42
2b3af97df2
various bug fixes
2015-05-13 11:07:47 -04:00
marshmellow42
a2e2bb8a15
hf mfu info - ICEMANS updates
...
plus slight change to UL_EV1 auth annotation.
2015-05-12 18:16:55 -04:00
marshmellow42
6ce0e5386a
HF Search - refactoring cmds to work with it
2015-05-12 16:45:48 -04:00
marshmellow42
8ceb6b03e5
hf search - prelim - re-use hf mfu GetTagType...
...
in hf 14a reader to identify UL(+)
still a work in progress.
2015-05-12 00:19:44 -04:00
marshmellow42
2be768af57
hf mfu info bugs
2015-05-11 18:22:50 -04:00
marshmellow42
4693c188ab
minor hf mfu output consistancies
2015-05-11 16:25:11 -04:00
marshmellow42
345fb24aaa
hf mfu info - ICEMANS bug fixes.
2015-05-11 15:56:12 -04:00
marshmellow42
f04ef47311
hf mfu info bug fixes
2015-05-11 14:49:37 -04:00
marshmellow42
f805ac7a2b
minor adjustments to mfu info
2015-05-08 13:01:27 -04:00
marshmellow42
c585a5cf0b
further MFU info updates (mainly icemans)
2015-05-06 22:15:41 -04:00
marshmellow42
372a82570b
MFU adj to allow 0 len returns on raw cmds
2015-05-06 10:17:39 -04:00
marshmellow42
45673b9457
MFU adjustment to allow 0 len returns from raw cmds
2015-05-06 10:16:31 -04:00
marshmellow42
abab60ae21
MFU info adjustments
2015-05-06 09:27:03 -04:00
marshmellow42
75377d29d6
MFU - Icemans further improvements
...
add UL-C device side read card with authentication
add MF_UL-Annotations
add ntag, and more ul descriptions in hf mfu info
2015-05-06 00:55:29 -04:00
marshmellow42
63e1d35a07
Merge remote-tracking branch 'upstream/master'
2015-05-03 23:31:58 -04:00
marshmellow42
f9848fd647
MFU dump UL-C with key
...
adding UL-C auth and keys to dump cmd
swapped endian for input of hf mfu crdbl to match output of hf mfu info
cmd and tag info app
2015-05-03 23:17:11 -04:00
Martin Holst Swende
4b36037948
Fixes to issue #100
2015-05-03 22:09:52 +02:00
marshmellow42
b3125340f3
Icemans UL-C Auth dev side fix plus a few other ...
...
... small UL fixes
2015-05-03 15:41:11 -04:00
marshmellow42
7eec1204e7
fix bug in mfu cauth
2015-04-30 10:34:20 -04:00
marshmellow42
92690507ab
Iceman's updates to MFU info and dump
2015-04-30 09:28:43 -04:00
marshmellow42
f168b2633b
MF Ultralight - Iceman's updates + mine
...
Beginning of Ultralight additions.
detection of Ultralight Types added
dump command now auto detects type
can authenticate Ultralight C
2015-04-29 18:27:31 -04:00
marshmellow42
bdfb62b405
Iceman's script aes fix #93
...
Thanks Iceman (note I did not have a tag to double test this one. :)
2015-04-28 15:53:07 -04:00
marshmellow42
4745afb647
Iceman's Issue #96 fix
2015-04-28 15:35:23 -04:00
Martin Holst Swende
a3abb02897
Merge branch 'master' of github.com:Proxmark/proxmark3
2015-04-23 09:51:04 +02:00
Martin Holst Swende
0e6c7336b0
Fixed issue with dumping iclass tags > 2KB in size
2015-04-23 09:50:44 +02:00
marshmellow42
8e0cf02308
minor change to lf em4x menu & iceman script...
...
...updates
2015-04-10 00:06:59 -04:00
marshmellow42
664f658650
nexwatch fix .h file + icemans mf csetblk w arg
...
forgot to include the new nexwatch command in the header...
added icemans hf mf csetblk w parameter fix
2015-04-08 15:08:05 -04:00
marshmellow42
25d3e5cc83
Merge remote-tracking branch 'upstream/master'
2015-04-08 14:19:19 -04:00
marshmellow42
411105e036
added nexwatch demod & iceman lua
...
added nexwatch demod (also added to lf search)
added iceman's lua script adjustments
2015-04-08 14:19:03 -04:00
marshmellow42
322f7eb111
fix to lf t5 detect/read cmds
...
i think this functions fairly well...
still some issues with demod positioning for various reasons.
ASK/Biph/FSK work pretty well
the PSK Demod still needs a little attention to help it better demod
various carriers...
2015-04-08 11:18:29 -04:00
marshmellow42
9632ecbe3d
update t5 detection test()
...
missed this file in last commit... sorry.
2015-04-08 10:12:24 -04:00
Martin Holst Swende
83602affe5
Fixed buffer initialization errors, as reported in http://www.proxmark.org/forum/viewtopic.php?pid=15337#p15337
2015-04-08 13:31:04 +02:00
marshmellow42
fef74fdce4
lf ask consolidation
...
backend:
askman and askraw demods merged into askdemod (args adjusted
accordingly)
re-arranged lfdemod.h in alphabetical order and by category
front end:
data detectclock a (ask) now also reports the selected best start
position for demod
data manrawdecode takes an invert arg now
2015-04-08 01:07:39 -04:00
marshmellow42
49bbc60af3
lf cleaning++
...
data askedgedetect - removed unneeded code
lf em em4x50read bug fix / error checking
graph-save/restore auto repaint after restore.
2015-04-07 00:53:06 -04:00
marshmellow42
cc15a1187b
lf cleanup - fixes
...
more lf em em4x50read fixes
adjust heavy clipping ask clock detection
clean up t55xx minor items
2015-04-06 23:17:30 -04:00
marshmellow42
1f918317e2
add maxErr to data manrawdecode
2015-04-05 21:59:36 -04:00
marshmellow42
224ce36eb1
lf t5xx - icemans update
2015-04-05 16:37:41 -04:00
pwpiwi
6306ff4bac
Merge branch 'master' into topaz
...
Conflicts:
armsrc/Makefile
client/Makefile
2015-04-05 19:45:59 +02:00
marshmellow42
2767fc0291
lf cleaning
...
remove unneeded code/functions
fix lfdemod askmandemod bug with maxErr=0
silence output for getting samples in lf search
2015-04-05 00:58:57 -04:00
marshmellow42
643fb10b2d
Merge remote-tracking branch 'upstream/master'
2015-04-04 21:29:16 -04:00
marshmellow42
6e98444637
lfdemod reduce duplicate code
...
remove check for best start position in demods and adjust the clock
detect to always return best start position to the demods
also small bug fix in lf em em4x50read
2015-04-02 23:55:12 -04:00
marshmellow42
23f0a7d862
lfem4x cleanup/add/fix
...
changed spacing to tabs for cmdlfem4x.c
finished the partially built lf em em4x50read function
added save/restore GraphBuffer function in graph.c
adjusted some tolerances in lfdemod.c
added a maxLen argument to the askmandemod
2015-04-02 12:48:52 -04:00
Martin Holst Swende
9795e535c9
Compiler correctly identified a buffer overflow, fixed that and made the code use snprintf instead of unsafe sprintf
2015-04-01 09:24:29 +02:00
Martin Holst Swende
d5d6f22718
Merge pull request #91 from marshmellow42/master
...
lfdemod.c refactoring (+ bug fixes)
2015-03-31 22:11:19 +02:00
marshmellow42
a4669d6ef3
small fix in t5 trace data
2015-03-31 11:30:16 -04:00
pwpiwi
c5847ae8af
refactoring hf topaz reader
2015-03-31 07:09:55 +02:00
Martin Holst Swende
caaf9618ae
Minor mod to 'hf iclass read', it now also reads and prints the configuration of the tag found
2015-03-29 21:49:58 +02:00
marshmellow42
f8f894a50f
rawdemod param cleanup
...
plus lfdemod.h cleanup
2015-03-27 23:47:31 -04:00
marshmellow42
2eec55c8a4
lfdemods streamline & bug fixes
...
removed duplicate code countPSK_FC - adjusted countFC to work.
bug fixes & streamlined code in:
lf hid fskdemod
lf em em410xdemod
cleaned up lfdemod.c some
2015-03-27 00:02:30 -04:00
pwpiwi
de15fc5fe3
add: hf topaz reader (basic functionality)
2015-03-25 22:00:48 +01:00
marshmellow42
e0165dcf3a
Fixed indents to Tabs from Spaces
...
Spacing changes ONLY - no code changes
2015-03-25 14:24:36 -04:00
marshmellow42
c7d169ec02
clean up em410x output
2015-03-24 22:11:32 -04:00
marshmellow42
90677ad99b
EM410x bug fix
2015-03-24 20:26:14 -04:00
marshmellow42
9680b11d9e
remove debugging print calls
2015-03-23 20:25:54 -04:00
marshmellow42
1fbf895616
lf updates
...
applies icemans full ata55x7 read/write settings
adds checksum to ioprox (thanks to iceman)
adds silent mode for lf read and getSamples
fix lf em em410xwatch and lf em410xspoof
improve data rawdemod ar - for biphase demods
improve detectclock a for strong antennas
2015-03-23 16:29:50 -04:00
marshmellow42
13d77ef964
lf t5 read plus lf demod adjustments
...
lf t5xx commands updated from ICEMAN
lf em410x commands updated
lf search bug fix for 2 args
test scripts from iceman
lf demod:
better ask clock detection with Strong fully clipped waves
better ask raw demod with strong fully clipped waves
fsk demod add back in skipped bits during demod
nrz demod add back in skipped bits during demod
2015-03-22 15:28:48 -04:00
pwpiwi
48ece4a750
add: Topaz mode for "hf 14a raw" (new option -T)
...
chg: allow tracing without parity
chg: make "hf list topaz" aware of additional commands for Dynamic Memory Model
2015-03-20 21:06:51 +01:00
pwpiwi
05ddb52c43
fix: introduced a stupid error when refactoring the start bit detector in MillerDecoding()
...
chg: use -O2 instead of -Os when compiling ARM sources
chg: don't clear the Miller decoders input buffer on reset
chg: be more specific for the Miller decoders start bit pattern
add: new option c in hf list: mark CRC bytes (default is off)
2015-03-18 18:32:43 +01:00
pwpiwi
ef00343cb1
revert change "hf list topaz" to "hf list nfc"
...
refactored Startbit detection in MillerDecoding()
relaxed startbit detection in MillerDecoding()
fixed CRC checking and CRC bytes marking in hf list
fixed topaz multi frame command listing in hf list topaz
2015-03-17 07:41:08 +01:00
marshmellow42
b41534d142
adjust ask/biphase handling - more complete
...
also added XL EM410x formats
2015-03-15 22:03:50 -04:00
pwpiwi
a8904ebd46
Change "hf list topaz" to "hf list nfc"
...
fix: reduce length of expected unmodulated signal in Miller decoder in order
to allow decoding of NFC reader communications
add: hf list nfc: aggregate reader commands into one line
add: hf list nfc: CRC check for NFC communications
2015-03-15 16:49:09 +01:00
marshmellow42
7a8a982bde
adjust pskdemod
...
add skipped bits before first phase back in
PSKDemod now returns 1 for success or 0 for fail like other demods
2015-03-13 20:49:34 -04:00
marshmellow42
e74fc2ecba
give credit where credit is due
...
thanks iceman for the crc :)
2015-03-13 14:00:11 -04:00
pwpiwi
ee1eadee0f
add: start to support Topaz tags
...
- hf 14a reader now exits gracefully in case of proprietary anticollision sequence
- changed miller decoder to handle Topaz 8 data bits/no parity frames from reader
- started to implement hf list topaz
2015-03-13 18:13:18 +01:00
marshmellow42
9f7bbd24c9
data autocorr additions
2015-03-13 12:23:26 -04:00
marshmellow42
5279085ae7
Merge remote-tracking branch 'upstream/master'
2015-03-13 11:20:00 -04:00
marshmellow42
d9d41e0f3f
minor g-prox-ii demod fix
...
lf search was occasionally outputting false results.
2015-03-13 11:18:55 -04:00
marshmellow42
73d04bb417
data psk demod minor fixes, pyramid demod add CS
...
also adjusted autocorrelate and added a printout for lf search u
2015-03-13 11:09:12 -04:00
pwpiwi
9185099ed8
Merge pull request #75 from pwpiwi/qtmakefile
...
(issue #47 ) use Qt5 includes and libraries, if present
2015-03-13 07:24:56 +01:00
pwpiwi
04bc1c660b
fix: hf 14a raw was broken
...
(see http://www.proxmark.org/forum/viewtopic.php?id=2351 )
2015-03-11 20:19:30 +01:00
pwpiwi
8c04722db6
(issue #47 ) use Qt5 includes and libraries, if present
2015-03-10 19:00:39 +01:00
Martin Holst Swende
58e93ff593
Merge pull request #74 from marshmellow42/master
...
new and fixed lf sim commands, lf demod refactoring, data gproxIIdemod
2015-03-10 00:25:51 +01:00
marshmellow42
1302428367
finish data printdemodbuffer command
2015-03-09 16:56:00 -04:00
pwpiwi
16a95d76ac
fix: (issue #73 ) hf mf cload didn't work. Add more annotations for Magic Cards operation.
2015-03-09 21:36:27 +01:00
marshmellow42
5658e82e1e
sim buffer max settings tests
2015-03-09 15:58:06 -04:00
marshmellow42
ada339a10f
biphase bug fixes
2015-03-09 15:27:20 -04:00
marshmellow42
d66d484347
fixed rawdemod help options
2015-03-08 18:07:01 -04:00
marshmellow42
712ebfa6df
1 bug fix + code trimming
2015-03-07 23:31:23 -05:00
marshmellow42
df51693f95
Merge remote-tracking branch 'upstream/master'
2015-03-06 12:30:16 -05:00
marshmellow42
78f5b1a77c
lf sim fixes/creations correct now
...
fixed lf simpsk
fixed lf em em410xsim
fixed lf sim (can go right from lf search to lf sim if you have a
strong antenna - if not use a demod first)
2015-03-06 12:28:54 -05:00
marshmellow42
e09f21fa7b
Revert "lf sim fixes/creations"
...
This reverts commit 293de1bad7
.
2015-03-06 12:26:33 -05:00
marshmellow42
293de1bad7
lf sim fixes/creations
...
fixed lf simpsk
fixed lf em em410xsim
fixed lf sim (can go right from lf search to lf sim if you have a
strong antenna - if not use a demod first)
2015-03-06 12:25:36 -05:00
ikarus
9cefee6f42
Fixed issue #36 & improved file consistency.
2015-03-04 11:00:39 +01:00
marshmellow42
39676885b4
Merge remote-tracking branch 'upstream/master'
2015-03-03 20:44:37 -05:00
Martin Holst Swende
27eabcdccb
Added brackets around crc field in protocol listings
2015-03-02 21:05:44 +01:00
marshmellow42
40b9bb85e6
oops... should this file should not have been there
2015-03-02 14:44:05 -05:00
marshmellow42
8d960002c8
lf cmds fix, add, show
...
show command to UI:
data printdemodbuffer - allow printing of demod buffer
Add:
data askgproxiidemod - demod a gproxii tag
Fix:
adjust lf simxxx commands further for testing
2015-03-02 14:42:55 -05:00
marshmellow42
ec9882b18c
PSKDemod Bug Fix
2015-02-22 21:11:25 -05:00
marshmellow42
3f41e73c7f
PSK demod adjustment
...
add carrier length test to weed out false positive demods
2015-02-22 20:09:58 -05:00
marshmellow42
3bc66a96fe
added PSK2 to lf simpsk
...
testing still ongoing.
2015-02-21 22:54:52 -05:00
marshmellow42
872e3d4d6f
NEW lf simpsk
2015-02-21 21:36:02 -05:00
marshmellow42
b4a2fcf676
Split output from nrz raw demod function
...
missed this one last time
2015-02-21 18:37:15 -05:00
marshmellow42
4ac906d1c2
split output from rawdemod functions
...
now allows for non-verbose calling:
ASKmanDemod
ASKrawDemod
FSKrawDemod
PSKDemod
2015-02-21 00:27:48 -05:00
marshmellow42
40148ab609
Merge remote-tracking branch 'upstream/master'
2015-02-19 21:38:17 -05:00
marshmellow42
abd6112fc4
Revert "Revert "lf simask, lf simfsk and bug fixes""
...
This reverts commit e396001c47
.
2015-02-19 21:35:34 -05:00
marshmellow42
e396001c47
Revert "lf simask, lf simfsk and bug fixes"
...
This reverts commit fb0c84c3df
.
2015-02-19 21:22:05 -05:00
marshmellow42
fb0c84c3df
lf simask, lf simfsk and bug fixes
2015-02-19 21:21:11 -05:00
Martin Holst Swende
0387cd3393
Merge pull request #68 from iceman1001/feature
...
ADD: identifications.
2015-02-19 10:51:10 +01:00
Martin Holst Swende
181e6db6a9
Merge pull request #67 from marshmellow42/master
...
Small help and command description updates
2015-02-19 10:50:51 +01:00
Martin Holst Swende
1defcf606f
More work on iclass full simulation, and some work on iclass tag dump parsing
2015-02-19 10:48:33 +01:00
Martin Holst Swende
b67f7ec359
Further implementation of iclass 'fullsim'. Moved protocol definitions to shared file. Had to add some loclass-function to arm-side to support authentication in fullsim mode
2015-02-18 20:02:44 +01:00
Martin Holst Swende
9a9bcea82b
Iclass decrypt error, shouldn't have decrypted block 6 according to Heart of darkness-paper
2015-02-17 23:17:43 +01:00
Martin Holst Swende
41524d8a39
Implemented 'hf iclass decrypt <tagdump>'. This performs the 3des decryption of iclass tag dumps, but requires the decryption file to be present on the filesystem
2015-02-17 22:07:40 +01:00
iceman1001
0853ffa29c
ADD: added the missing EM identifications. Thanks to Asper for providing the needed information about LC ID's
2015-02-16 19:06:24 +01:00
iceman1001
33315928fb
CHG: added some more token-tags.
2015-02-16 19:05:59 +01:00
marshmellow42
8db0534ed1
Merge remote-tracking branch 'upstream/master'
2015-02-14 21:16:27 -05:00
marshmellow42
cc2ea5ed82
Clean up Helps and command descriptions
2015-02-14 21:15:13 -05:00
Martin Holst Swende
a4749080d9
Removed un-implemented 'hf iclass write', it's confusing to have there since there's no actual support for this on the device side
2015-02-14 21:18:39 +01:00
Martin Holst Swende
534445139c
Reformatted
2015-02-14 21:17:08 +01:00
Martin Holst Swende
7781a65656
Started work on 'hf iclass eload' - only client side so far, not yet supported in the device
2015-02-14 21:15:53 +01:00
Martin Holst Swende
428d622160
Fixed bug with iclass dump which prevented saving to file
2015-02-14 20:42:23 +01:00
marshmellow42
abd16c456a
fix help on data rawdemod commands
2015-02-13 21:17:15 -05:00
Martin Holst Swende
2e2fc9fa6b
Merge branch 'master' of github.com:Proxmark/proxmark3
2015-02-13 19:59:50 +01:00
Martin Holst Swende
699bb9dc27
Removed some dev- printouts
2015-02-13 19:59:28 +01:00
Martin Holst Swende
17c60b1248
Merge pull request #63 from marshmellow42/master
...
lf data combine rawdemods & depreciate cmds
2015-02-13 10:11:40 +01:00
Martin Holst Swende
37735250ca
Merge pull request #66 from iceman1001/feature
...
ADD: identification of EM4233
2015-02-13 10:11:09 +01:00
Martin Holst Swende
8b9393d3bd
fixed issue #65
2015-02-12 08:21:58 +01:00
pwpiwi
19a700a8b5
hf 14a: if the tag supports it, set default timeout according to ATS
...
hf epa: remove explicit but arbitrary timeout settings
Bugfix: don't timeout when frame transmission has already started
2015-02-11 22:20:22 +01:00
iceman1001
070e36d421
ADD: identification of EM4233
2015-02-11 17:14:26 +01:00
Martin Holst Swende
61972abbdd
Merge branch 'master' into GenericTracing
...
Conflicts:
armsrc/iso14443a.c
2015-02-10 21:25:14 +01:00
Jesse Hallio
3bba7deac0
Add settable ATQA and SAK to hf mf csetuid command.
2015-02-10 04:31:53 +02:00
marshmellow42
7e72f90a7f
Merge remote-tracking branch 'upstream/master'
2015-02-09 16:47:24 -05:00
pwpiwi
0d0d049967
hw tune, data tune: adjusted "unusable" and "marginal" voltages. Display LF tuning graph only when LF antenna is connected.
2015-02-09 22:36:53 +01:00
marshmellow42
19ff0210fa
lf data combine rawdemods & depreciate cmds
...
new:
data rawdemod
replaces:
data askmandemod
data askrawdemod
data fskrawdemod
data nrzrawdemod
data psk1rawdemod
data psk2rawdemod
also commented out of the CommandTable but did not remove the commands:
data askdemod
data bitstream
data fskdemod
data mandemod
data threshold
2015-02-09 16:25:12 -05:00
marshmellow42
f3bf15e484
lf/data combined detectclock functions to one
...
cleaned up detect clock functions - now uses one main function that
takes a char argument to select which modulation to detect the clock for
REMOVED commands: pskdetectclock, nrzdetectclock, fskfcdetect.
renamed DetectClock function to DetectAskClock to be more descriptive.
2015-02-09 11:11:04 -05:00
marshmellow42
b4fb11ba92
fix inconsistent spacing within functions
...
did not convert spaces to tabs but made the functions consistent with
what it used so it can be auto converted.
(sorry for the annoying space/tab usage in the past.)
we can convert all to tabs later.
2015-02-08 00:48:00 -05:00
marshmellow42
be2cf126bf
Merge remote-tracking branch 'upstream/master'
2015-02-06 14:45:46 -05:00
marshmellow42
6de4350803
data askraw patches, data askedgedetect demod,
...
data askraw patches - added amp option (for stubborn waves)
NEW data askedgedetect demod for manual demod,
adjusted detectclock (ask clock) in case of cleaned (edgedetect) waves
finish maxErr args
finish psk detect
2015-02-06 14:36:25 -05:00
Martin Holst Swende
7d5ebac993
Merge branch 'master' into GenericTracing
...
Conflicts:
armsrc/iso14443.c
armsrc/iso14443a.c
client/cmdhf.c
client/cmdhf14b.c
2015-02-06 08:41:02 +01:00
marshmellow42
e770c64824
lf psk/nrz split, add maxErr argument
...
changed psk to use wave lengths instead of peaks
split out NRZ from psk demod
added maxErr argument to raw demods (except fsk)
2015-02-05 17:01:18 -05:00
Martin Holst Swende
146c201cbe
Merge pull request #55 from jessegit/master
...
Add flasher from SVN r623 for HID bootprom and current Mac OS X kext
2015-02-05 19:43:46 +01:00
Martin Holst Swende
b37235637f
Merge pull request #57 from iceman1001/feature
...
FIX: LF TI WRITE inparameters didn't get copied by sscanf.
2015-02-05 19:43:26 +01:00
iceman1001
5c2b11eb3c
FIX: LF TI WRITE inparameters didn't get copied by sscanf. This removes the "PRIu64" and uses the 012"llx" instead.
2015-02-05 15:46:23 +01:00
iceman1001
a6cfa75035
add: lots of new toytypes in default_toys.lua
...
fix: mixture between dec & hex numbers caused wrongly identifications of toytypes (default_toys.lua)
add: showing bytes for trap-types in tnp3dump.lua
2015-02-04 11:49:21 +01:00
Jesse Hallio
e9281ae812
Add flasher from SVN r623 for HID bootprom and current Mac OS X kext
2015-02-03 23:22:39 +02:00
Martin Holst Swende
1f78a4d305
Merge pull request #54 from Proxmark/lf_recorder
...
LF: Ability to do longer traces/snoops
2015-02-02 19:54:07 +01:00
Martin Holst Swende
0644d5e3a3
Merged with master
2015-01-31 18:21:38 +01:00
Martin Holst Swende
c856ceae8a
Fixed undecimation command
2015-01-31 12:42:40 +01:00
Martin Holst Swende
698b649e0e
Added undec to un-decimate data on the client side, so we can use all those sweet demodders even if the data has been decimated on the ARM side
2015-01-31 00:05:04 +01:00
Martin Holst Swende
31abe49fd3
Some more fixes to longer lf recordings. Now also supports longer snoops, and an additional command 'lf config' has been defined, instead of having to specify all params for every call
2015-01-30 23:03:44 +01:00
Iceman
0c5998c051
Update cmddata.c
...
as suggested, a bitwise bounds check in cmddata.
2015-01-30 15:17:07 +01:00
iceman1001
33c7e2f3bc
wrong letter in variable name
...
Conflicts:
client/cmddata.c
2015-01-29 22:35:19 +01:00
Martin Holst Swende
92623113b4
Minor documentation on 'hf list'
2015-01-29 20:01:30 +01:00
Martin Holst Swende
f6d9fb173f
Added client-side support for recording longer samples, fixed last (?) issues on device-side
2015-01-29 00:57:22 +01:00
pwpiwi
f71f4deb8f
BigBuf and tracing rework: allow much longer traces in in hf commands
...
- provided a BigBuf_malloc() function to dynamically allocate parts of BigBuf
e.g. for DMA-Buffers, Frame-Buffers, Emulator-Memory
- the whole rest of BigBuf is now available for traces (instead of a small fixed amount)
- send actual traceLen together with trace data
- changed client side to cope with varying traceLen
- changed small buffers to automatic variables instead of parts of BigBuf
2015-01-28 07:18:51 +01:00
Martin Holst Swende
936e0729f9
Merge pull request #49 from marshmellow42/master
...
LF Demod Bug Fix & new traces
2015-01-27 22:14:39 +01:00
Martin Holst Swende
383608a63a
Minor fixes to iso14443a annotations
2015-01-27 21:55:08 +01:00
marshmellow42
a1d17964a2
lf demod bug fix & refactor
...
fixed bug in lfops.c in hid fskdemod
refactored data fskXXXDemods for specific tags to use more common code.
2015-01-27 14:51:12 -05:00
Martin Holst Swende
08e8317c21
More annotations to iso14443b protocol listings
2015-01-27 16:34:45 +01:00
marshmellow42
8c65b650e8
clean up some comments
2015-01-26 17:49:30 -05:00
marshmellow42
04d2721b3c
lf psk demods
...
clarify existing as psk1
added psk2 demod
2015-01-26 17:23:19 -05:00
marshmellow42
9c0f13d5dd
Merge remote-tracking branch 'upstream/master'
2015-01-26 17:07:49 -05:00
Martin Holst Swende
dca558bf9e
Removed last trace of crypto from makefile
2015-01-26 20:56:33 +01:00
Martin Holst Swende
e629181f5a
Fixed issue where -1 size_t was returned
2015-01-22 21:04:16 +01:00
Martin Holst Swende
afceaf4018
Removed openssl from the mfu-stuff
2015-01-22 21:02:21 +01:00
marshmellow42
03e6bb4aed
lf FSK demod tools/fixes
...
added full ability to detect FSK clocks
applied autodetect of fsk clock to data fskrawdemod
this finished data fskfcdetect (now detects field clocks and bit clock)
2015-01-22 14:24:03 -05:00
Martin Holst Swende
388c92bde5
Generic tracing pt.4: Deprecated old 'hf 14b list' command
2015-01-22 00:19:20 +01:00
Martin Holst Swende
c54d1394c6
Fixed compiler error
2015-01-22 00:10:09 +01:00
Martin Holst Swende
9e8255d4e9
Generic tracing pt.3 : reworking how iso14443b-traces are stored in ARM-memory
2015-01-21 23:53:40 +01:00
iceman1001
df3e429d71
minor fix for a help in "hf 14a snoop"
2015-01-21 21:24:37 +01:00
marshmellow42
ec75f5c10a
lf Bug Fixes and lf demod additions
...
added data fskparadoxdemod
added data setdebugmode (for demods)
added data shiftgraphzero (to help clean weak reads)
fixed a few bugs with the data detectaskclock
added data fskfcdetect to detect FSK clocks
adjusted most of my demods to put raw tag binary to demod buffer for
future sim and clone commands (psk still needs work)
2015-01-20 17:28:51 -05:00
iceman1001
a1557c4c2f
Minor fixes: Array inits, some array bounds checks.
...
ADD: some extra help text for lf snoop
ADD: HasGraphData - function in graph.c
ADD: DetectHighLowInGraph - function in graph.c
2015-01-20 22:14:56 +01:00
iceman1001
e469159145
FIX: another file_path found in loadTraceCard and saveTraceCard, is now corrected to follow FILE_PATH_SIZE variable.
...
FIX: some filehandles that didn't get closed.
2015-01-20 21:58:53 +01:00
iceman1001
80b1b53fa3
SUGGESTED FIX:
...
Issue: https://github.com/Proxmark/proxmark3/issues/35
Forum: http://www.proxmark.org/forum/viewtopic.php?pid=7883#p7883
Where "hf mf csetuid" empties the rest of the block0 bytes.
This fix loads the old block0 and replaces the uid+sak+ataq bytes only.
2015-01-20 21:55:19 +01:00
iceman1001
fe5b3a4424
FIX: The 14b write command (CmdHF14BWrite) now turns off antenna after call.
2015-01-20 21:50:49 +01:00
iceman1001
e3c235654f
Minor fixes to some help-texts.
2015-01-20 21:48:39 +01:00
iceman1001
81740aa519
STEP 3 - the actual new files for Ultralight.
...
ADD: script remagic.lua -- a script to make a "dead" Mifare s50 generation 1 alive again.
ADD: tracetest.lua - This script will load several traces files in ../traces/ folder and do
"data load"
"lf search"
ADD: test_t55x7_psk.lua - iterates thru a lot of calls to check the new psk demods.
all new scripts implements the "-h" for help text.
2015-01-20 21:29:55 +01:00
iceman1001
5ee701292f
Step 2 - Ultralight / Ultralight-C
...
With this the Pentura Labs / Midnitsnakes's original ultralight / ultralight-c implementation is enhanced and move to its own file. cmdhfmfu.c
2015-01-20 21:23:04 +01:00
iceman1001
c8b6da2295
Merge branch 'master' of https://github.com/holiman/proxmark3
...
Conflicts:
armsrc/appmain.c
armsrc/apps.h
Step 1 for the Ultralight / Ultralight-c
2015-01-20 20:59:24 +01:00
iceman1001
5149e37e66
Merge branch 'master' of https://github.com/Proxmark/proxmark3
...
Conflicts:
armsrc/appmain.c
armsrc/apps.h
2015-01-20 09:32:53 +01:00
marshmellow42
53d85a8fa1
Merge remote-tracking branch 'upstream/master'
2015-01-18 18:19:26 -05:00
marshmellow42
1e090a61a1
lf demod additions
...
data fskfcdetect (field clock and bit clock detect for FSK)
data fskdemodawid -AWID demod/decode
data fskdemodpyramid - AWID demod/decode
2015-01-18 18:13:32 -05:00