Philippe Teuwen
119e3f0ed9
Makefile: allow alternative platforms, try make PLATFORM=foo
2019-03-11 00:44:34 +01:00
iceman1001
b26e60dae9
turn off fpc default
2019-03-10 14:40:41 +01:00
iceman1001
40ccdb0e73
clean up
2019-03-10 14:39:46 +01:00
Philippe Teuwen
7d25c72e40
Makefile: recompile arm only when needed
2019-03-10 12:55:17 +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
0373696662
make style
2019-03-10 00:00:59 +01:00
Philippe Teuwen
8a7c6825b5
armsrc: fix mix of spaces & tabs
2019-03-09 20:34:41 +01:00
iceman1001
a819d522c1
textual
2019-03-09 11:51:46 +01:00
iceman1001
f4409ab375
chg: revert it
2019-03-09 11:51:18 +01:00
Philippe Teuwen
957464ca88
armsrc Standalone: fix mix of spaces & tabs
2019-03-09 11:19:45 +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
4160e32b0a
Replace isNoise by computeSignalProperties and removeSignalOffset
2019-03-08 19:06:55 +01:00
Philippe Teuwen
4ffeebc193
Fix return code check for iso14443b_select_card in hf epa
2019-03-05 16:39:26 +01:00
vratiskol
99dc51e005
Mem Leak
2019-02-24 22:02:09 +01:00
iceman1001
4ea05fc026
Fix: 'hf mf fchk' - now reports back correct found keys.
2019-02-17 15:56:45 +01:00
iceman1001
7934630d2b
FIX: Makefile bad styled calls
2019-02-14 19:27:39 +01:00
merlokk
69f3e65dd0
fix memmove if len=0
2019-02-05 18:39:03 +02:00
merlokk
0e5d896893
fix endless loop
2019-02-05 18:27:48 +02:00
bogiton
75aeec6507
Add led blink on successful flash write
2019-02-04 17:44:29 +00:00
merlokk
cf21f046d8
arm side
2019-01-30 18:15:47 +02:00
merlokk
1b3d96ab2d
add apdu chaining to arm side
2019-01-29 19:30:15 +02:00
iceman1001
8991fa172d
FIX: wrong define
2019-01-29 15:47:44 +01:00
iceman1001
730a7e8044
FIX: 'hf legic sim' - needed even more timeout.
...
see https://github.com/RfidResearchGroup/proxmark3/issues/83
2019-01-25 13:48:53 +01:00
iceman1001
803aab7431
FIX: 'hf legic sim' - longer timeout for writes? (@drandreas)
...
see https://github.com/RfidResearchGroup/proxmark3/issues/83
2019-01-25 11:58:00 +01:00
iceman1001
0bec6038b7
CHG: adjusted compiling for older devices
2019-01-23 10:57:49 +01:00
iceman1001
20c3cd5ce3
chg: adjusting license according to earlier commits to pm3 offical repo.
2019-01-14 12:02:26 +01:00
iceman1001
a5833fe390
CHG: remove strange thr 0x43 in LF sampling
...
CHG: refactor cotag init
2019-01-12 12:10:31 +01:00
iceman1001
f215ebef80
Refactored 'lf t55xx brute', split it up into two commands.
...
- lf t55xx brute (tries bruteforcing a range of pwds
- lf t55xx chk (uses dictionary file or RDV4 flashmem)
FIX: adjust lf sim (@marshmellow42) see 7008cf9c15
"attempt to speed up the loops waiting for carrier signal to go high or low
by only checking for a halt (button press or usbpol) every 256th loop
iteration. some users were experiencing modulating reactions to be too slow.
ADD: 'lf t55xx chk'
It uses @marshmellows42 idea behind commit (6178b085a0
)
With calculating a baseline (read block0 32times and average the signal-ish) and sampling only 1024 signal data. The algo then proceeds to calc the average and keep track of the candidate which is given the most difference in signal data average value. I do some squaring and shifting for this.
The candidate is then send back to client to be tested properly with trymodulation like before.
This seems to work good on t55xx card which has a ASK configuration.
WORK-IN-PROGRESS
2019-01-11 14:46:27 +01:00
iceman1001
8a514ea8f1
REM: remove unused files
2019-01-09 16:28:06 +01:00
iceman1001
e276bf1ce3
FIX: gcc8.1 warnings
2019-01-09 16:25:49 +01:00
iceman1001
6743e45386
CHG: name changes
2019-01-09 12:05:29 +01:00
iceman1001
2612cd006a
CHG: bigbuf adaptations
2019-01-09 12:00:06 +01:00
iceman1001
3ae871f534
CHG: 'hf 14a antifuzz' - original implementation by @asfabw, reworked a bit - WORK IN PROGRESS -
2019-01-07 09:32:16 +01:00
iceman1001
c1237cfa26
FIX: 'lg pcf7931' - improved read code (@sguerrini97)
2019-01-06 21:05:29 +01:00
iceman1001
c37cc81c00
CHG: FeliCa more details
2019-01-06 20:42:51 +01:00
iceman1001
0dee369a58
FIX: 'hf tune' - now works...
2019-01-06 20:28:23 +01:00
iceman1001
38853b111f
FIX: adding directives to reduce size on systems like Gentoo Hardned (see https://github.com/iceman1001/proxmark3/issues/268 )
2019-01-05 20:59:00 +01:00
iceman1001
6e281a08ed
CHG: 'hf mf fchk' - speed improvments by tweaking implementation.
...
CHG: 'hf mf fchk' - can use dictionary from flashmem if one is uploaded. (faster)
2019-01-02 11:52:13 +01:00
iceman1001
0fb0c35308
CHG: 'mem load' - the possibility to upload default_iclass_keys.dic, default_keys.dic, default_pwd.dic to predefined flashmemory sections. These will be used in pwd / key checking algorithms on device.
...
CHG: 'script run read_pwd_mem.lua' - script now can print those uploaded dictionary files.
How to upload
pm3 --> mem load f default_iclass_keys i
pm3 --> mem load f default_keys m
pm3 --> mem load f default_pwd t
How to validate / view
PM3 -->scr run read_pwd_mem -o 237568 -k 8
pm3 -->scr run read_pwd_mem -o 241664 -k 6
pm3 -->scr run read_pwd_mem -o 245760 -k 4
2019-01-01 18:01:40 +01:00
Chris
f8c33af1da
CHG: FPC connector tests. Device -> Client communications works.
...
Adjust armsrc/Makefile and client/Makefile to include the -DWITH_FPC flag to compile with FPC enabled.
2018-11-20 10:58:32 +01:00
Chris
aa3b322d0f
chg: 'analyze a' - some fpc test changes.
2018-11-16 23:59:14 +01:00
Chris
faef1a0938
chg: lf simulation - trying the new clock for better timings.
2018-11-16 23:57:55 +01:00
Chris
fd1c0cac79
FIX: 'standalone mode MattyRun' - compiles and should even work
...
CHG: 'standalone mode' - generic banner for each mode. Updated the ledshow to @cjbrigato
2018-11-16 02:52:42 +01:00
Chris
9bff2ab74f
CHG: cleaning up
2018-11-14 15:06:28 +01:00
Chris
bac3ad077e
FIX: 'standalone mode colinrun' - buffer overrun (thanks @angelsl)
...
1aa974fc70
2018-11-14 09:05:08 +01:00
merlokk
1f1d8bfc0b
fixed armside epa.c
2018-11-08 20:29:29 +02:00
merlokk
0cfa47e628
merged iso14 arm side
2018-11-08 20:29:08 +02:00
RFID Research Group
ce30c29f47
Merge branch 'master' into master
2018-11-07 12:12:47 +01:00
Chris
078196773c
CHG: 'standalone bogitorun' - adapted some ledshow from Kigiv mode and increased time for user to stop pressing button after triggering the mode..
2018-11-06 22:20:55 +01:00
Chris
5a03ea7135
chg: 'standalone mode BogRun' - cleaning
2018-11-06 19:14:19 +01:00
Chris
4d124c46f2
chg: 'standlone mode colinrun aka KIGIV' - made it smaller to fit a normal compilation of fullimage
2018-11-06 19:13:06 +01:00
bogiton
d6d96eb7fe
Fixed offset bug (thanks iceman)
2018-11-06 13:36:00 +00:00
Chris
98e24013cf
chg: 'hf mf chk' - since the function ends with droping the field, lets just make sure the field is off to start with.
2018-11-05 22:34:46 +01:00
Chris
4da4b33d8d
fix: 'lf t55xx deviceconfig' - bug that failed to load default values if wiped flashmem.
2018-11-01 19:51:45 +01:00
RFID Research Group
8759c0a9f7
Merge pull request #44 from bogiton/master
...
Standalone HF Sniff (and ULC/NTAG/ULEV1 pwd storing)
2018-10-28 15:31:50 +01:00
bogiton
2718e783dc
Added small description
2018-10-28 13:54:38 +00:00
bogiton
43f90181b3
Update hf_bog.c
2018-10-28 13:34:42 +00:00
bogiton
9bd7770dfe
Revert to default standalone mode
2018-10-28 12:04:44 +00:00
bogiton
785ab8f73e
Baudrate and optimization (removed counter)
2018-10-28 12:01:36 +00:00
bogiton
34775c81f5
Added BogitoRun identification
2018-10-21 18:29:49 +00:00
Chris
22fb92f9c8
sugar
2018-10-21 19:51:22 +02:00
bogiton
1c2af2a5ed
Added hf_bog standalone
2018-10-16 19:50:18 +00:00
bogiton
8079613b37
Add check for the HF_BOG directive for RunMod
2018-10-16 19:41:05 +00:00
bogiton
34c1da7ad4
Include the HF_BOG standalone mode
2018-10-16 19:39:29 +00:00
Chris
dc67b5d7c9
chg: revert fpga_major mode in LF.
...
chg: 'lf t55xx deviceconfig' - persistence to flashmem is now option with param P
2018-09-23 05:29:55 +02:00
Chris
d596343438
chg: 'lf t55xx deviceconfig' - assume total time, and writeenable when writting...
2018-09-16 20:48:39 +02:00
Chris
02cc278e19
chg: remove warnings on coverity
...
chg: encapsule flasmem function calls
2018-09-16 20:47:23 +02:00
TomHarkness
3e9397e337
Fix syntax
2018-09-15 16:20:44 +10:00
Chris
43c399876f
chg: helptext
2018-09-12 07:59:43 +02:00
Chris
ba2543b627
ADD: 'lf t55xx deviceconfig' - command that allows for setting t55xx timings via the client. If run on a RDV40, it also saves the config to flashmemory. This gives you option to have custom timings for your custom antenna in order for your RDV40 to work optimal against a t55xx tag and with your custom antenna. (@iceman)
2018-09-11 18:35:07 +02:00
Chris
9ee550af45
FIX: lf t55xx detect works better with adjusted timings
...
CHG: applied fpga_off patch.
2018-09-10 21:45:00 +02:00
Chris
90f29bf430
chg: call specific noise function
2018-09-09 11:29:37 +02:00
Chris
ba9de80eeb
chg: 'hf legic sim' break sim by sending another cmd
2018-09-09 11:29:11 +02:00
Chris
79afc031fc
FIX: LF antenna discharge after interfer timings. As suggested by @ts And thanks to @drandreas who patiently explains fpga verilog code to me.
...
This introduces a new majoe mode, FPGA_MAJOR_MODE_OFF_LF, which should ONLY be used in sending loops for LF. Basically the PWR_LO is set HIGH in order to discharge voltage faster.
Once sending is over, the normal FPGA_MAJOR_MODE_OFF SHALL be used.
2018-09-08 14:11:51 +02:00
Chris
e5e8c0b5d8
not needed anymore
2018-09-07 23:45:08 +02:00
Chris
24eaac8681
CHG: the thread comms refactoring from offical pm3 repo
...
chg: FPC com speed limited to 115200 when compiled with FPC
chg: USART remake (@drandreas)
2018-09-06 21:43:20 +02:00
RFID Research Group
eb0b5116a2
Merge pull request #25 from drandreas/rdv4-legic
...
Legic Tag Simulator
2018-09-06 20:26:39 +02:00
Colin J. Brigato
7e12fc0ceb
Pass 2; commit 3/3;
2018-09-06 05:34:48 +02:00
Colin J. Brigato
368fe11df0
Second Pass rewrite of flashmem. added command 'mem spibaud' to switch between 24/48Mhz operation. All is more consistant, less messy. All logic rewrittent avoiding multiple flashinit/flashstop. busywait is now at it's lowest possible. Beware : 48Mhz is VERY buggy cause of sillicon bug (see source for more info), and doesn't give much more than 24Mhz for now since we doubled nearly every operation speed here.
2018-09-06 05:15:52 +02:00
AntiCat
e1fa1e659a
Legic: Implemented write command for card simulation
2018-09-05 23:03:05 +02:00
AntiCat
2981fe7ce8
Legic: Implemented read command for card simulation
2018-09-05 23:03:05 +02:00
AntiCat
cd78b00815
Legic: Implemented setup phase for card simulation
2018-09-05 23:03:05 +02:00
AntiCat
2c6c4e5bc6
Legic: Implemented trace log
2018-09-05 23:03:05 +02:00
AntiCat
fe91a3f52f
Legic: Implemented RX and TX for card simulation
2018-09-05 23:03:05 +02:00
AntiCat
61e4eac2b2
Legic: Moved card simulator into separate file & cleaned interface.
...
Reader and card simulation have almost no common code. Moreover the sim
uses an SSP Clock at 212kHz for all timings to prevent any drifting from
the PRNG. This clock speed is not available in reader simulation mode (SSP
runs at up to 3.4MHz, and changes speed between TX and RX). For these
reasons having the code in separate files makes it significantly cleaner.
2018-09-05 23:03:04 +02:00
Colin J. Brigato
76e2d7502a
Merge remote-tracking branch 'upstream/master'
2018-09-05 20:39:56 +02:00
Colin J. Brigato
2263c826db
Restore Makefile, temporiraly provide Makefile.Colin
2018-09-05 20:34:28 +02:00
Chris
4c72acaf63
FIX: cleanup code, sync of output texts.
2018-09-05 18:58:58 +02:00
Chris
4c37126baf
cleanup
2018-09-05 18:58:04 +02:00
def
b7bdc69e5a
lfops.c CmdEM410xdemod empty TAG ID fix.
2018-09-05 17:50:31 +03:00
Chris
307063474d
CHG: cleanup
2018-09-04 20:36:25 +02:00
Chris
ac6bd61544
FIX: longer t55xx timings to compensate for delay of field damping, and minor adjustments.
2018-09-04 20:35:29 +02:00
Chris
e12d22b6d9
FIX: 'LF Standalone modes' - Ensure that noise check is performed for any device-side processing otherwise device-side processing will see all LF signals as noise.
...
From: 8bddce8096
2018-09-04 20:32:52 +02:00
Chris
27a036b087
FIX: logic behind compiler directive is now correct
2018-09-04 20:31:12 +02:00
Iceman
701b96d7fe
Update readme.md
2018-09-03 22:45:01 +02:00
Chris
76e7603ef1
textual
2018-09-03 22:36:43 +02:00
Chris
0e3ba1c058
CHG: easier to configure compilation of standalone mode. Just swap -D directive once your new standalone mode is ready and you added your code for it
...
based on a modification by @marshmellow42
2018-09-03 22:27:18 +02:00
Colin J. Brigato
8d673fa1bf
First pass rewrite of flashmem driver for optimization. Lot of changes here. Provides PoC of saving and recalling a tag in Standalone mode. Added some printing passthrough to client to azccomodate for vt100 eye-candyness. FastREAD mode implemented for flashmem, testable from client. Beta but functionnal. Reading the whole flash with 1Kb to 32kb buffers was ~730ms, now 380ms Max (even at 24Mhz spi baudrate)
2018-09-03 00:02:44 +02:00
Chris
f1d0e9db4d
fix: revert back
2018-08-29 19:42:46 +02:00
Chris
42e883f67b
FIX: print_result - now prints correct len.
...
FIX: DOWNLOAD_BUFFER - now with correct result logic
2018-08-28 21:15:28 +02:00
Chris
ca5b476730
FIX: 'standanlonemode colin' - mifare1ksim called with correct params (@cjbrigato)
2018-08-26 08:19:59 +02:00
Chris
2eab02e3ba
CHG: 'standalone mode MattyRun' - added some comments and suggestion
2018-08-25 23:26:04 +02:00
Chris
fe332a1f2b
removed unneeded ramfunc attribute
2018-08-13 23:50:17 +02:00
Chris
91dea8d694
code clean.
2018-08-13 23:49:33 +02:00
Chris
5f77121694
initial commit to be in sync the-soon-defunct repo pm3rdv40.
2018-08-12 21:54:31 +02:00
Andreas Dröscher
9ba20b590a
change: reduced demodulator to bare minimum
...
The initial code added complexity without improving reading distance.
Thankfully the peak detection signal path has a low noise floor.
2018-08-12 12:51:45 +02:00
Andreas Dröscher
0d0b651246
change: re-added trace log
2018-08-12 12:51:45 +02:00
Andreas Dröscher
ff5b046903
change: re-added status LEDs
...
- LED_A: FPGA and 13.56MHz carrier is active
- LED_B: Reading Byte
- LED_C: Writing Byte
2018-08-12 12:41:45 +02:00
Andreas Dröscher
e052fbc433
change: re-added legic write support
2018-08-12 12:41:45 +02:00
Andreas Dröscher
9d330dde87
fix: 32bit tick timer based on TC0 and TC1
...
TC1 counts the number of TC0 overflows (carry bits).
In random conditions TC1 would return or stay at zero,
instead of counting up. This due to the behavior of the
reset signal.
SAM7S Series Datasheet, 33.5.6 Trigger:
Regardless of the trigger used, it will be taken into account
at the following active edge of the selected clock. This means
that the counter value can be read differently from zero just
after a trigger, especially when a low frequency signal is
selected as the clock.
The new code first prepares TC1 and asserts TC1 trigger and
then prepares TC0 and asserts TC0 trigger. The TC0 start-up
will reset TC1.
2018-08-12 12:41:11 +02:00
Andreas Dröscher
c06f0af7f3
change: switched from timestamps (us) to ticks
...
GetCountUS() has a jitter of +/- 7us this is not precise
enough to keep the PRNG in sync. 1.5 * GET_TICKS on the
other hand is spot on.
2018-08-12 09:59:48 +02:00
Andreas Dröscher
e0adc976e0
change: added rx/tx coordination timestamp
2018-08-12 09:59:48 +02:00
Andreas Dröscher
7244f5825d
change: legic reader tx back to bigbang
...
I've tried to modulate the Legic specific pause-puls using ssc and the default
ssc clock of 105.4 kHz (bit periode of 9.4us) - previous commit. However,
the timing was not precise enough. By increasing the ssc clock this could
be circumvented, but the adventage over bitbang would be little.
2018-08-12 09:59:48 +02:00
Andreas Dröscher
3029223158
change: legic reader now uses xcorrelation and ssc based io
...
- Even tough legic tags transmit just AM using xcorrelation
results in a significantly better signal quality.
- Switching from bit bang to a hardware based ssc frees
up CPU time for other tasks e.g. demodulation
2018-08-12 09:59:48 +02:00
Andreas Dröscher
c59150657c
add: xcorr 211.875 kHz option
...
The FPGA supported this frequency for a long time, just the ARM code
had no define to enable it.
2018-08-12 09:59:48 +02:00
Andreas Dröscher
db70ab8f7d
change: remove broken legic simulator
...
It will be rewritten in a later commit
2018-08-12 09:59:48 +02:00
Andreas Dröscher
8a53137ab0
change: remove dead legic code
...
This code was either disabled or never reached.
2018-08-12 09:59:48 +02:00
Andreas Dröscher
e779f06c5e
change: clean up Legic interface
...
I see no adventage in poluting all sources that include legicrf.h
with our internal depedencies (includes) and function names.
2018-08-12 09:59:48 +02:00
Iceman
c339035ec5
Revert "WIP: Clean Legic Reader"
2018-08-06 15:05:36 +02:00
Andreas Dröscher
058426fa17
change: added rx/tx coordination timestamp
2018-08-05 00:57:20 +02:00
Andreas Dröscher
8f797d1388
change: legic reader tx back to bigbang
...
I've tried to modulate the Legic specific pause-puls using ssc and the default
ssc clock of 105.4 kHz (bit periode of 9.4us) - previous commit. However,
the timing was not precise enough. By increasing the ssc clock this could
be circumvented, but the adventage over bitbang would be little.
2018-08-05 00:57:20 +02:00
Andreas Dröscher
78d5188922
change: legic reader now uses xcorrelation and ssc based io
...
- Even tough legic tags transmit just AM using xcorrelation
results in a significantly better signal quality.
- Switching from bit bang to a hardware based ssc frees
up CPU time for other tasks e.g. demodulation
2018-08-04 23:13:17 +02:00
Andreas Dröscher
d7c57dbc08
add: xcorr 211.875 kHz option
...
The FPGA supported this frequency for a long time, just the ARM code
had no define to enable it.
2018-08-04 23:13:17 +02:00
Andreas Dröscher
1adff322b1
change: remove broken legic simulator
...
It will be rewritten in a later commit
2018-08-04 23:13:17 +02:00
Andreas Dröscher
33eb2f5fa0
change: remove dead legic code
...
This code was either disabled or never reached.
2018-08-04 23:13:17 +02:00
Andreas Dröscher
37867fbf3b
change: clean up Legic interface
...
I see no adventage in poluting all sources that include legicrf.h
with our internal depedencies (includes) and function names.
2018-08-04 23:13:17 +02:00
Chris
bacf8aff0f
add: FPC connector skeleton usart. Not working but if will be a starting point for those who might want to help out with it.
2018-07-30 09:54:44 +02:00
iceman1001
08d9d9daf9
cleaning
2018-07-29 18:20:56 +02:00
iceman1001
c082531110
fix: potential implicit type cast issue (Thanks to @drandreas for pointing it out)
2018-07-29 18:20:39 +02:00
iceman1001
506da3ff4c
textual
2018-07-29 16:30:36 +02:00
iceman1001
4172ea6c19
cleanup
2018-07-28 14:26:37 +02:00
iceman1001
4d8488e14b
CHG: https://github.com/Proxmark/proxmark3/pull/631 from offical repo. (piwi)
...
CHG: textual adjustments
2018-07-28 14:25:12 +02:00
Chris
afeb0d0cd7
fix: removes unneeded floating point lib inclusion (@piwi)
2018-07-23 21:02:13 +02:00
Chris
fff2f51cfb
chg: testing to switch from WaitXX calls to SpinDelay, they seem to mess up
2018-07-06 09:10:13 +02:00
Chris
79158c7360
chg; preparing for more cmds.
2018-07-06 00:24:04 +02:00
Chris
36d774506c
chg: 'sm raw' - implemented 'r' don't read reply
2018-07-05 21:10:21 +02:00
Chris
2ccbde8110
chg: 'flashmem' - adjust debugstatemnts
2018-07-05 20:29:16 +02:00
Chris
fca841122f
chg: 'sc reader' - hooked up atr.
2018-07-05 16:32:10 +02:00
Chris
ee006c6a7b
add: sc upgrade - beta test
2018-07-05 14:38:31 +02:00
Chris
e7342e7402
chg: 'sc upgr' shouldnt print too much
2018-07-05 11:37:04 +02:00
Chris
f70b8be5de
add: 'sc' - smart card commad [rdv40]
...
chg: test to read out firmware
2018-07-05 10:48:24 +02:00
Chris
3ecff83de2
chg: clean up
2018-07-04 15:29:27 +02:00
Chris
9571cf1d13
chg: and wrap FPC code with defines..
2018-07-04 13:05:23 +02:00
Chris
a32052b5e6
chg: and remove link to FPC code
2018-07-04 13:01:53 +02:00
Chris
392161e20e
chg: don't compile FPC yet
2018-07-04 12:58:28 +02:00
Chris
8f06f85cc4
DEL: removed old smartcard files
2018-07-04 12:22:12 +02:00
Chris
49735b62f1
syntax sugar
2018-07-04 12:20:08 +02:00
Chris
adb9e94487
chg: OR values
2018-07-04 12:19:29 +02:00
Chris
e09f9cbb32
add: RDV40 smart card module comms ( Thanks to @Willok! ) bitbanging i2c with it
2018-07-04 12:19:04 +02:00
Chris
ed5367a124
chg: adjusting 14b demod to increase reading distance
2018-06-30 22:48:59 +02:00
Chris
2b294912ee
chg: 'hf iclass chk' - enabled credit/debit key selction
...
chg: 'hf iclass lookup' - enabled credit/debit key selction
fix: first item in dictionary file now correct identified
chg: code cleanup
2018-06-30 22:47:07 +02:00
Chris
abdd51b6b3
chg: 'hf mf sim' led
2018-06-23 06:31:42 +02:00
Chris
4633e2083a
debug
2018-06-23 06:30:47 +02:00
Chris
28a4260ee9
chg: 14b fixes
2018-06-19 12:57:27 +02:00
Chris
d9e8b63363
chg: setting pins
2018-06-13 14:38:46 +02:00
iceman1001
bd857b263f
syntax
2018-05-22 12:10:02 +02:00
iceman1001
501c29f76d
add: support for reading flashmem
2018-05-22 12:09:17 +02:00
iceman1001
6b7819276d
add: 'mem info' - rudamentary support for new command.
2018-05-06 09:26:06 +02:00
iceman1001
110a7b28cb
chg: 'hf 14a sim' - possibility to simulate FM11RF005SH (@maozhenyu123)
...
chg: 'hf 14a info' - tag identification for FM11RF005SH (@maozhenyu123)
Fudan FM11RF005SH , has 512bit mem, 16blocks w 4bytes / block.
Support REQA, READ, WRITE, AUTH. Unknown how the auth is done.
The ATQA/SAK , or a trace from one of these tags would be intersting to look at.
2018-05-06 09:24:28 +02:00
iceman1001
3e7576c86d
fix: 'hf mfu rdbl'
...
fix: 'hf mfu dump' - bad exit strategy
2018-05-03 22:41:28 +02:00
iceman1001
4cd72b95c5
fix: coverty scan #277726 , unsigned value comparision always true.
2018-05-03 20:36:01 +02:00
iceman1001
989b80007c
chg: removed debugstatements
2018-05-03 16:20:46 +02:00
iceman1001
e50fef6607
fix: 'mem load' - wrong offset when uploading
2018-05-03 16:10:38 +02:00
iceman1001
021c0a1349
ADD: 'mem' commands. For RDV40 devices only.
...
If you don't have one, comment out inside client/Makefile this line
CFLAGS += -DWITH_FLASH
2018-05-03 12:15:03 +02:00
iceman1001
207fa2b574
add: potential fix for OSX uses, by @piwi
...
chg: adapting fix to support iceman forks extended commands.
2018-05-02 08:11:29 +02:00
iceman1001
98f0e9a284
fix: print.c on device doesn't have support for formatter %f
2018-04-27 12:16:35 +02:00
iceman1001
271cb3e1cc
chg: \r didn't work well with printandlogex
...
chg: spaces
chg: cleaning
2018-04-27 12:15:26 +02:00
iceman1001
2017f321b7
fix: memory issue, took all bigbuff
2018-04-25 01:33:25 +02:00
iceman1001
695d4cbb51
chg: fix coverity scan bug, variable is treated like a array
2018-04-20 20:07:41 +02:00
iceman1001
6ab1b285a0
chg.
2018-04-20 19:50:56 +02:00
iceman1001
f5718fb448
chg: wiping / reading / writing flashmem
2018-04-20 16:11:10 +02:00
iceman1001
a746699f5f
chg: reading / writing flashmem works better now.
2018-04-19 00:27:44 +02:00
iceman1001
42569a6f13
chg: adjusting for DEFINE usages.
2018-04-18 16:17:49 +02:00
iceman1001
0492df266c
chg: only print if compiled with smartcard flag
2018-04-18 12:41:03 +02:00
iceman1001
d4c0de0c3c
chg: turn off led A
2018-04-16 20:19:44 +02:00
iceman1001
a615fd6a9e
chg: smartcard , testing to use pwm clock instead of timer clock.
...
chg: added some comments
2018-04-16 19:58:49 +02:00
iceman1001
192aa9abd7
CHG: renamed iso7816 files
...
ADD: smartcard functionality (big thanks to Chris Nocker!)
2018-04-08 10:51:19 +02:00
iceman1001
726edb87cb
chg: flashmem unique id is 64bit
2018-04-08 10:24:24 +02:00
iceman1001
3f5aab8f05
chg: preparing for iso7816 module statuses
2018-04-03 11:45:20 +02:00
iceman1001
141cde93dd
add: buzzer code from elechouse repo
2018-03-31 10:44:44 +02:00
iceman1001
a37518b1c3
chg: renamed smartcard.c -> iso7816.c
...
chg: default standalone mode is LF_SAMY.. The HF_COLIN takes a lot of space
2018-03-31 10:43:09 +02:00
iceman1001
836d7370c3
spaces
2018-03-31 10:36:39 +02:00
iceman1001
3d956e686b
chg: flashmem adaptions
2018-03-31 10:35:40 +02:00
angelsl
1aa974fc70
Fix buffer overrun in hf_colin
2018-03-25 21:16:23 +08:00
iceman1001
fd1b86d607
ADD: flashmemory functionality for RDV40 Huge thanks to @willok !
2018-03-19 15:58:50 +01:00
iceman1001
0eca7e3977
chg: #define rename
2018-03-16 08:58:07 +01:00
iceman1001
3438d016c7
idea based on @jamchamb PR in official pm3 https://github.com/Proxmark/proxmark3/pull/584
2018-03-15 20:06:12 +01:00
iceman1001
ce418fb720
chg: 'hf mfu read'
...
chg: 'hf mfu dump' - 5 retries if failed readblock. Loop for CRC error or incomplete reads.
This will make reading / dumping more stable.
2018-03-15 19:59:33 +01:00
iceman1001
5690c0f5bc
chg: 'hw detectreader' - kind of useless previous change, measuring from two different readers, the max was 18.8v and 20.1v Not even close to 36v the standard ADC is configured
2018-03-15 10:48:57 +01:00
iceman1001
c3ba3f306f
chg: 'hw detectreader' - RDV40 adjustment
2018-03-15 09:25:22 +01:00
iceman1001
62814fd352
fix: 'hw detectreader' - adapted to PM3 RDV40 for HF measures.
2018-03-15 09:20:21 +01:00
iceman1001
7e0455aa0c
ADD: 'MattyRun' standalone - added the MattyRun standalone mode. *untested compilation*
2018-03-12 12:27:43 +01:00
Colin J. Brigato
9147698e97
UPDATES HF_COLIN to current
2018-03-10 13:13:21 +01:00
iceman1001
7fb6aa21ab
chg: skeleton files for smartcard / flashmem
2018-03-05 20:08:28 +01:00
iceman1001
857bc8ab66
ADD: SmartCard skeleton
2018-03-04 14:14:08 +01:00
iceman1001
802994d30a
add: 'hf 14 antifuzz' - the outline for the new functionality which fuzzes the anticollision phase ISO 14443a.
2018-02-28 13:21:47 +01:00
iceman1001
8083bfec32
add: marshmellow42 's fix for cotag endless loops
2018-02-28 08:08:07 +01:00
iceman1001
8eb0a42b5a
chg: adjustments
2018-02-28 08:04:53 +01:00
iceman1001
535c92fee5
FIX: added @marshmellow42 's fix for #514 (offical repo) lf search hang with no tag on antenna.
2018-02-28 07:59:41 +01:00
iceman1001
567a312cf4
chg: textual
2018-02-25 16:04:55 +01:00
iceman1001
7b9ba2de8e
chg: standalone modes - adapted for HF_COLIN aswell, for easier compilation
2018-02-25 16:04:24 +01:00
iceman1001
23ecd4154a
FIX: standalone mode HF_COLIN - it now compiles.
2018-02-25 08:15:38 +01:00
iceman1001
22715e7a99
minor adjustements
2018-02-22 15:13:43 +01:00
iceman1001
87b3df94c1
chg: minor syntax
2018-02-22 15:04:49 +01:00
iceman1001
1c37981430
fix: StandAloneMode proxbrute - missing variable and missing define. ZERO = 0.
2018-02-22 15:03:20 +01:00
iceman1001
92a42c2189
fix: wrong define
2018-02-21 09:03:02 +01:00
iceman1001
ab77b8a3d9
chg: ..oring..
2018-02-21 08:30:47 +01:00
iceman1001
cfff094bc3
SPI comments
2018-02-20 12:06:03 +01:00
iceman1001
d54c4d3e05
chg: SPI tests for flashmem on PA10. (aka pm3 evo) Peripheral B, fixed.
2018-02-20 12:03:11 +01:00
iceman1001
6c6aad6196
chg: SPI configuration. adjustments with defines, makes easier to understand
2018-02-20 12:01:22 +01:00
iceman1001
229ce1a156
chg: 'lf cmdread' - lowered the waiting times for antenna to power down / up
2018-02-18 10:37:13 +01:00
iceman1001
a21ab49f14
chg: moved flash mem config for spi into flashmem.c
...
chg: fpgasendcommand, now waits until command has been sent to fpga.
2018-02-18 10:35:36 +01:00
iceman1001
35bdf6a58d
FIX: Accourding to errata, a SPI reset should be executed twice.
2018-02-17 17:35:54 +01:00
iceman1001
b0d3362eef
chg: adjusted to macros
2018-02-16 20:45:13 +01:00
iceman1001
103e0b5191
chg: more tests
2018-02-15 09:19:13 +01:00
iceman1001
d20b11a288
chg: chips select
2018-02-15 09:18:31 +01:00
iceman1001
18aa477a55
chg: 'lf cmdread' -adjustments, @marshmellow42
2018-02-14 21:45:36 +01:00
iceman1001
b2a3b0f72a
chg: 'lf cmdread' @marshmellow42 improvements from https://github.com/Proxmark/proxmark3/pull/570
...
chg: and some adaptations..
2018-02-14 21:40:52 +01:00
Federico Cerutti
2dbe5ad720
Fix for uneven octet error when no data is received
2018-02-14 15:48:28 +01:00
iceman1001
d0da96bf8a
remove warning "missleading-indentation"
...
flashmen spi 9bits?
2018-02-13 16:13:37 +01:00
iceman1001
46d540490f
chg: add response ack.
2018-02-13 15:45:15 +01:00
iceman1001
1709c1ce1a
chg: flash_mem - hooked up client - device comms
2018-02-13 15:36:20 +01:00
iceman1001
0495e93b6d
add: flash memory support
2018-02-13 14:12:28 +01:00
iceman1001
ad73af95c2
ADD: beginning to add SPI to access flash memory.
2018-02-13 11:41:23 +01:00
iceman1001
85b2533435
chg: 'hw tune' device side should be unsigned and only 1024 (10b ADC)
2018-02-13 11:40:05 +01:00
iceman1001
dc66765306
chg: 'lf cmdread' - adjusting loop
2018-02-09 00:27:02 +01:00
iceman1001
5adb9af78f
chg: 'hw tune' - compensating the 3% error marginal.
2018-02-09 00:25:45 +01:00
iceman1001
fe34cac012
FIX: 'hf mf darkside' - no more WDT crashes. plus positive sideeffects (@pwpiwi)
...
https://github.com/Proxmark/proxmark3/pull/569
2018-02-08 19:11:35 +01:00
iceman1001
de631c32ac
textual
2018-02-08 10:31:23 +01:00
iceman1001
ff07af84bf
fix: StandAloneMode samyrun, proxbrute, - id values are unsigned
2018-02-08 09:55:23 +01:00
iceman1001
374571046d
remove debug..
2018-02-07 20:12:16 +01:00
iceman1001
aee5fcb24a
debugs
2018-02-07 17:22:23 +01:00
iceman1001
094b5db9c5
fix: configure mux at startup
2018-02-07 17:21:51 +01:00
iceman1001
a2ac368fdb
fix.. wrong switch
2018-02-07 13:14:04 +01:00
iceman1001
75d04307a1
chg: adapting some HF voltage readings.
2018-02-07 13:11:10 +01:00
iceman1001
3d2fd2e3a1
FIX: start up,MUXSEL_HIPKD(PA19),MUXSEL_LOPKD(PA20) are floating state. Should adapt FPGA image aswell.
2018-02-07 12:08:50 +01:00
iceman1001
13bb29a386
fix: 'hf mf fchk' - releasing memory when finished is a good thing
2018-02-05 22:59:49 +01:00
iceman1001
3464fbe1df
fix 'hf mf darkside' - adapted solution from @pwpivi
2018-02-05 20:46:14 +01:00
iceman1001
fca1c9b7cf
chg: 'hf mf mifare' - (deviceside) reset cycles when negative or too large
2018-02-05 16:47:10 +01:00
Jean-Pierre Clair
847656c613
spelling error authetication instead of authentication
2018-02-05 14:09:38 +01:00
iceman1001
6605d92fbb
chg: tried making the reselect more stable.
...
chg: 'hf iclass readblk'
chg: 'hf iclass writeblk'
chg: 'hf iclass dump'
chg: 'hf iclass clone'
all commands now has 'v' verbose parameter for more detailed output.
2018-02-04 12:25:55 +01:00
iceman1001
6a9ddf6e69
chg 'hf iclass chk' - increased timeout, switch off antenna before each run in order to reset card, three retires. all this make it more stable.
2018-02-04 10:20:38 +01:00
iceman1001
dc25f9212f
FIX: 'hf iclass sim 2'
...
FIX: 'hf iclass sim 4'
FIX: 'hf iclass loclass' - this fixes the bug where loclass assumes the epurse value is all zeros, while it now should save the epurse value during the simulation if it is updated/read.
I assume a empty valid epurse, while an all zero epurse is too much easy to detect as a anomaly.
2018-02-04 00:52:29 +01:00
iceman1001
856e2770a6
chg: 'hf iclass sim' different output
2018-02-01 17:44:27 +01:00
iceman1001
e0373212a3
chg: 'hf iclass sim' - sim2, 4 get less default output, set DBG 4 for verbose
2018-02-01 16:10:24 +01:00
iceman1001
fa5b550fa8
chg: should be a define.
2018-02-01 15:35:00 +01:00
iceman1001
145bccdea8
chg: wrong type
2018-02-01 15:33:10 +01:00
iceman1001
519cc72966
chg: crc change
2018-02-01 15:22:01 +01:00
iceman1001
52d69ed4ee
CHG: refactor CRC16 algos. This is a big change, most likely some parts broke, hard to test it all.
2018-02-01 15:19:47 +01:00
iceman1001
721ba5d287
fix: 'hf iclass sim' - too small buffers caused sim to fail
2018-02-01 09:31:30 +01:00
iceman1001
c6207d09e1
chg: 'hf felica reader' is better, almost working good
2018-01-30 03:29:37 +01:00
iceman1001
50743b7e88
rem: 'hf iclass' blocknum LUT is gone. Removed also functionality for it.
2018-01-29 16:44:49 +01:00
iceman1001
5c380767e8
chg: 'hf iclass' removed a blocknum LUT implementation. My guess is the new crc16_iclass will do fine.
2018-01-29 16:38:03 +01:00
iceman1001
b39332e938
REM: 'hf 15 debug' removed command, unified with mf_debuglevel instead. The idea is to have ONE debug flag on deviceside.
2018-01-29 15:58:00 +01:00
iceman1001
787d87e0e6
testing to make dma buffer larger.
2018-01-29 13:42:42 +01:00
iceman1001
c04ac4f9ac
ADD: 'hf felica reader' - added pm3 as FeliCa reader
...
ADD: raw commands - added the basis for sending RAW commands to FeliCa.
CHG: CRC16 rework, uses table based implementation. This will change more functions as I go on.
2018-01-29 13:42:02 +01:00
iceman1001
fd854a9308
chg: added Abrasive's uart implementation, its simpler to understand but the downside it doesn't do both speeds. (1/4 , 1/2556).
...
ref 2b8bff7dae
2018-01-28 12:36:41 +01:00
iceman1001
57df6a1a7e
revert: add reflect function since its used in crc.c
2018-01-28 10:49:57 +01:00
iceman1001
cf44d04be1
add: reflect16
...
rem: swapbits, reflect
2018-01-28 10:46:46 +01:00
iceman1001
e76b4f93b8
notes
2018-01-27 23:15:08 +01:00
iceman1001
ede55a1498
add: fast 8bit reversal.
2018-01-27 22:20:56 +01:00
iceman1001
60afef3938
FIX: 'hf snoop' - forcing function to clean up AT91C_BASE_SSC->SSC_RFMR into default setup values.
...
FIX: 'lf ti' - forcing to cleaning up of SSC when finished.
2018-01-27 20:30:50 +01:00
iceman1001
a6c50d7de2
chg: 'hf 14b' removed a delay loop when transmit as reader
2018-01-25 18:44:25 +01:00
iceman1001
5939164635
FIX: 'hf 15' timouts bugs when wait is set == 0...
...
thanks @lnv42 for fix 84cb4f6bbf
2018-01-21 18:34:29 +01:00
iceman1001
be82f9f018
DEL: 'hf mf sniff' - since it is very similar to 'hf 14a sniff' , I removed this command. The desired functionality will become a new 'hf list mf' option in the future.
2018-01-18 14:11:22 +01:00
iceman1001
b4afc8cdc4
fix: 'hf mf sniff' - @merlokk 's adjustments
2018-01-17 00:28:40 +01:00
iceman1001
de983252eb
chg: dma macros instead
2018-01-17 00:27:13 +01:00
iceman1001
93ecfddb88
CHG: iso15 from b8f35947f2
@lnv42
2018-01-16 21:07:58 +01:00
iceman1001
466bbe1733
fix: 'hf mf hardnested' - too fast timeouts. https://github.com/Proxmark/proxmark3/issues/518
2018-01-15 14:22:46 +01:00
iceman1001
5ee4eeb84b
chg: 'hf mf sim' wrong debuglevel for message
2018-01-11 22:08:02 +01:00
iceman1001
5ea8f73547
FIX: cmd_send has wrong varible definitions, leading to loss of values.
2018-01-11 21:47:27 +01:00
iceman1001
eed271af5c
CHG: 'hw tune' tuning antenna now can handle bigger antennas than 65v, with shifting 9, it can measure up to 130v.
...
CHG: 'hw tune' - command output and layout changes. I think this is easier to read.
2018-01-09 14:53:17 +01:00
iceman1001
b578e55d17
chg: 'hf 14b snoop' renamed 'hf 14b sniff'...
...
In order to use one command for SNIFFING.. All snoop names will be renamed.
2018-01-06 21:12:28 +01:00
iceman1001
647d275d18
chg: 'hf felica litedump' - now turns off device when aborted via keyboard, or buttonpress
2018-01-05 17:57:50 +01:00
iceman1001
05b62d0b3d
syntax sugar
2018-01-05 17:40:07 +01:00
iceman1001
82dbfba827
chg: 'hf felica litedump' - more stable impl. Will not break when run twice in a row. Still device can be in a loop if 100sec timeout occures. :(
2018-01-05 17:39:04 +01:00
iceman1001
6e93ed80a3
chg: 'hf iclass sniff' - still problems with the dmabuffer
2018-01-02 19:10:55 +01:00
iceman1001
fe9416db23
chg: 'hf iclass' - work in progress. running default_iclass_keys.dic against reader (pm3 as simulation)
2018-01-02 11:17:31 +01:00
iceman1001
036d050384
chg: syntax sugar
2018-01-02 11:15:23 +01:00
iceman1001
186de6e1ae
chg: adapting to new paths
2017-12-24 10:30:29 +01:00
iceman1001
231b0df578
CHG: 'hf iclass reader' - the select / which blocks to read / before saying it succeded was corrupt
2017-12-21 13:48:06 +01:00
iceman1001
3634327bef
chg: code cleaning.
2017-12-21 12:42:32 +01:00
iceman1001
5eafdbf872
ADD: 'hf iclass check' - increased speed in check keys with new algo.
...
ADD: 'hf iclass' - trying to add the timeout-limits for commands in order to get a more stable iclass communication
2017-12-21 10:13:40 +01:00
iceman1001
154c30d0e5
fix: 'hf iclass reader' - do not always turn off device ..
2017-12-17 08:06:12 +01:00
iceman1001
594e4fe169
fix: (@pwpivi) fa85b08504
2017-12-12 15:49:43 +01:00
iceman1001
439c875905
chg: 'hf mf fchk' - need to reset the block number after a scan
2017-12-11 22:54:14 +01:00
iceman1001
bf74302679
chg: 'hf mf fchk' - reversing assumption. This really helped :)
2017-12-11 22:49:44 +01:00
iceman1001
033bc12933
chg: 'hf mf fchk' - adapttions to depth first exits
2017-12-11 22:33:50 +01:00
iceman1001
dd024b5300
chg: 'hf mf fchk' - depth first search
2017-12-11 21:43:29 +01:00
iceman1001
da57e74140
CHG: 'hf mf fchk' - two strategys. depth first for sector 1, AB. and width first with all sectors.
...
first run strategy 1. then 2.
2017-12-11 01:44:55 +01:00
iceman1001
9665bd526a
chg; less debug
2017-12-11 01:19:58 +01:00
iceman1001
26353cfd78
chg: 'hf mf fchk' - testing new strategy, Depth first for sector0.
2017-12-10 23:59:19 +01:00
iceman1001
f9e73b9c61
chg: adjusting debug levels
2017-12-10 23:23:08 +01:00
iceman1001
bf2b2afeeb
cleaning up.
...
chg: swapped random gen for mifare classic auth to known weak prng.
2017-12-10 23:09:53 +01:00
iceman1001
cb92ed9ec0
fix
2017-12-10 20:09:16 +01:00
iceman1001
0e96c72476
fix: wupe timing (@pwpiwi) 7c7327e7c8
2017-12-10 20:02:51 +01:00
iceman1001
71fa461403
fix: timeout issues with checkkeys etc
2017-12-10 11:38:26 +01:00
iceman1001
dfdf4e701f
chg: testing to reinstate the auth-timeout
2017-12-10 11:18:44 +01:00
iceman1001
19fe01128c
chg: 'hf mf chk' - reinstate the debuglevel
2017-12-10 11:11:23 +01:00
iceman1001
2d6fead9de
fix...
2017-12-10 10:06:27 +01:00
iceman1001
a27a29c0c6
chg: use defines instead.
2017-12-10 09:52:26 +01:00
iceman1001
0e9f234f11
CHG: lessend the default debug level to MF_DBG_ERROR.
2017-12-09 08:27:56 +01:00
iceman1001
0430b84f65
CHG: 'hf 14a sim', 'hf mf sim' - now uses weak PRNG from Crypto1 as nonce generation.
2017-12-07 15:21:06 +01:00
iceman1001
44280abf62
chg: reverting back to more or less offical pm3 version.
2017-12-07 15:02:15 +01:00
iceman1001
e94ceecb79
chg: 'hf mf mifare' - my darkside attack has been buggy last months. This reverts back to offical pm3.
2017-12-06 21:53:11 +01:00
iceman1001
2e35725f2f
chg: 'hf mf mifare' - the darkside attack works bad...
2017-12-06 01:09:12 +01:00
iceman1001
56dbf3ea15
chg: 'hf mf nack' - adjustments in return values..
...
add: 'hf 14a info -n' added new parameter, to enable test for nack bug.
2017-12-06 00:34:57 +01:00
iceman1001
e5f92935a1
chg: more adjustments
2017-12-06 00:17:49 +01:00
iceman1001
0c0e20eb06
chg: adjustments
2017-12-06 00:12:15 +01:00
iceman1001
6a028bdd18
fix: 'hf mf nack' - now does it better..
2017-12-06 00:03:34 +01:00
iceman1001
0a1a48df01
chg: 'hf mf nack' - extracted in into mifarehost for easier usage in other cmds like
...
'hf 14a info'
chg: 'hf mf nack' - changes on devices side from @doegox Thanks!
2017-12-05 23:34:52 +01:00
iceman1001
db82738527
chg: 'hf mf mifare' - warning if select card failed but continue searching
...
chg: 'hf mf nack' - warning if select card failed but continue searching
2017-12-05 18:18:20 +01:00
iceman1001
8b3ff03599
chg: 'hf mf nack' - cleaning up
2017-12-05 18:14:19 +01:00
iceman1001
a43f156370
chg: 'hf mf nack' - minor
2017-12-05 18:04:21 +01:00
iceman1001
6e5038f224
chg: 'hf mf nack' - only test all 256 parities for one nonce when synced.
...
0 nack = has not bug.
1 nack == has bug
x nacks == most likely a clone card which answers nack to all requests.
2017-12-05 17:57:44 +01:00
iceman1001
ba4df1b9fc
chg: 'hf mf nack' - trace on.
2017-12-05 13:25:16 +01:00
iceman1001
08193fd2e5
chg: getting crazy out of sync when running against magic cards.
2017-12-05 12:30:40 +01:00
iceman1001
984a26370d
chg: 'hf mf nack' better output
2017-12-05 11:53:42 +01:00
iceman1001
4289846383
chg
2017-12-05 11:39:31 +01:00
iceman1001
a2ba749a04
chg...
2017-12-05 11:37:10 +01:00
iceman1001
0e9a0d4b71
chg: remove unused vars
2017-12-05 11:35:07 +01:00
iceman1001
4f3e9f0f1f
chg: 'hf mf nack' - loop three times. change nonce
2017-12-05 11:33:32 +01:00
iceman1001
355572826a
chg: this debug statement interups with all other printouts.
2017-12-05 11:01:05 +01:00
iceman1001
ea6136456c
chg: 'hf mf nack' - use faster iso select
2017-12-05 10:52:53 +01:00
iceman1001
e02e145fae
draft for a Mifare classic NACK bug detection.
...
the idea is to have a statistically solid conclusion if tag does or does not have the NACK bug.
-in short, ref https://github.com/iceman1001/proxmark3/issues/141
NACK bug; when a tag responds with a NACK to a 8 byte nonce exchange during authentication when the bytes are wrong but the parity bits are correct.
This is a strong oracle which is used in the darkside attack.
2017-12-04 19:36:26 +01:00
iceman1001
5614066a4e
fix: no more powered antenna when swapping fpga images.
2017-11-30 10:28:59 +01:00
iceman1001
430c6b4b79
It seems a call to FpgaDownloadAndGo() powers the antenna.
...
Solution: Turn off antenna afterwards
2017-11-30 08:27:31 +01:00
iceman1001
efb0580199
fix: file doesnt exits
2017-11-25 10:24:15 +01:00
iceman1001
2c7930d178
fix: missing.
2017-11-25 10:22:47 +01:00
iceman1001
c5ee621160
rem: EMV on armside is cleaned out.
2017-11-25 10:20:52 +01:00
iceman1001
fcbb559b63
rem: remove emv implementations from peter fillmore. There is a better one on client side.
2017-11-25 10:14:13 +01:00
iceman1001
9d4d8b6e2c
chg: iso14443a timeouts, (@pwpiwi)
...
chg: apdu prolonged timeout (@merlokk)
2017-11-25 10:11:37 +01:00
ikarus
3ecc3b231a
fix: misleading indentation
2017-11-22 23:08:50 +01:00
iceman1001
f906cb7f89
chg: 'hf mf sim' @piwi's changes part 1
2017-11-11 22:41:52 +01:00
iceman1001
92f37c4c22
chg: 'apdu' @merlokk changes
...
chg: @piwi's changes to timing
chg: @piwi's changes to rats.
2017-11-11 22:39:13 +01:00
iceman1001
a4069fe2aa
chg: code cleaning
2017-11-11 22:34:34 +01:00
iceman1001
c74360a629
chg: 'hf 14b' deviceside cleaning
2017-11-11 01:32:58 +01:00
iceman1001
8f4c96cc81
chg: 'lf hitag' - don't send garbage (@marshmellow42)
2017-11-11 01:31:45 +01:00
iceman1001
c3403da76c
chg: 'hf felica' adjustments
2017-11-11 01:26:53 +01:00
iceman1001
b01f3d2352
syntaxt sugar
2017-10-30 22:20:41 +01:00
iceman1001
db56ca11a3
FIX: detect noise signal by measuring amplitude of signal.
2017-10-30 19:18:30 +01:00
iceman1001
05991cdffb
sloppy
2017-10-30 15:12:03 +01:00
iceman1001
deeb56f09c
fix: 'hf mf hardnested' : without sending dummy answer, the can't select tag comes..
2017-10-30 15:02:44 +01:00
iceman1001
0520d42f3d
revert back..
2017-10-30 12:22:02 +01:00
iceman1001
6e46822c4c
CHG: mcIdent now turn on/off readerfield.
2017-10-30 12:05:14 +01:00
iceman1001
0ea06dbe9b
CHG: spelling misstake
...
CHG: code cleanup. unused function.
2017-10-30 12:02:57 +01:00
iceman1001
f805fe995b
fix.. don't ask..
2017-10-29 11:23:26 +01:00
iceman1001
bc131dd105
fix: high and low variable should now contain raw hex.
2017-10-29 11:20:10 +01:00
iceman1001
0ef6e190e7
fix. missing variable and semicolon
2017-10-29 10:40:39 +01:00
iceman1001
6aec2f5951
FIX: spelled wrong. downside with working in notepad++
2017-10-29 10:38:49 +01:00
iceman1001
573a312130
fix: removed a refence to missing file
2017-10-29 03:53:09 +01:00
iceman1001
2e32fd289c
ADD: StandAloneMode LF Proxbrute by @brad-anton
...
https://github.com/brad-anton/proxbrute
--adjusted to fit iceman fork and latest enhancements to LF
(untested)
2017-10-29 03:51:07 +01:00
iceman1001
c1f742dfe5
CHG: updade some define and helptext
2017-10-29 03:47:00 +01:00
iceman1001
fab1b64760
ADD: standalone mode : LF HID corporate 1000 bruteforce by @federicodotta et al.
...
https://github.com/federicodotta/proxmark3
--adjusted to fit iceman fork and latest enhancements to LF
(untested)
FIX: some calls to deviceside demods, use 0 instead of reference.
ADD: timeout after n cycles of simulating
2017-10-29 03:26:46 +01:00
57ca2b96b7444cb986b2d6cf51d25ffd86c57743
34b076f7af
Enclosed naked statements with braces to avoid C compliler misleading-indentation 'guard' warning.
2017-10-23 17:37:29 -04:00
iceman1001
9e527537c6
fix: remove compile warnings (@winguru)
2017-10-23 21:19:46 +02:00
iceman1001
4bfc3ca8c9
CHG: part of @piwi changes
2017-10-23 21:17:59 +02:00
Iceman
b6d68ec0aa
Update readme.md
2017-10-22 17:00:53 +02:00
iceman1001
55e87490cf
fix: remove all traces of fpga_nfc...
2017-10-20 22:01:10 +02:00
iceman1001
4b48e63ccc
ADD: missing felica.c
2017-10-20 20:30:17 +02:00
iceman1001
4b63f940f1
CHG: FeliCa implemenation by @satsuoni
2017-10-20 20:27:44 +02:00
iceman1001
3108293c1f
ADD: New standalone mode by (@cjbrigato) Excellent work!
2017-10-20 15:29:33 +02:00
iceman1001
a9bf084916
chg: Shortend a wait. Not sure why we wait here.
2017-10-20 14:51:12 +02:00
iceman1001
dc7473135c
syntax cleaning
2017-10-17 22:05:52 +02:00
iceman1001
d46955e309
FIX: bootrom - flashmode should also not assume sizeof(usbcommand) 544 bytes
2017-10-17 21:14:36 +02:00
iceman1001
16028f7d33
CHG: appmain now calls cmd_recieve as it should
...
CHG: flasher - removed unneeded parameter to function
CHG: flasher - increased limit to fpga-files that can be loaded
FIX: main client, wrong windows define fixed.
CHG: device side - recieve usb command does not always get 544 bytes. usb packages can be incomplete.
CHG: usb_cdc.c also got piwi's changes.
CHG: uart_posix.c removed a debug value
CHG: uart_win32.c clean up.
2017-10-17 20:58:17 +02:00
iceman1001
71a500d824
CHG: 'hf mf fchk' - no need to send dummy coomand to trigger timeout.
...
CHG: 'hf mf fchk' - added some debugstatements. These will become optional later.
CHG: 'hf mf fchk' - lower re-try from 10 to 5
2017-10-12 15:17:10 +02:00
iceman1001
2fc88b924d
CHG: increased time to powerup tag
2017-10-12 15:14:41 +02:00
iceman1001
a41cdf803a
ADD: add the fpga part to arm.. (@satsuoni)
2017-10-11 12:48:37 +02:00
iceman1001
1cca109429
chg: validating we got a full usbcommand (512b)
2017-10-11 12:48:04 +02:00
iceman1001
ce5525bc16
chg: 'hf iclass simulate' adjustements
2017-10-08 15:11:38 +02:00
iceman1001
674db8d5ac
fix: 'hf snoop' - buffer overflow (@satuoni)
2017-10-08 14:56:04 +02:00
iceman1001
2ca0ea8cb4
ADD: 'hf mf fastchk' - new command, improved check keys functionality. It uses a bunch of techniques to get a speedup.
...
Using a dictionary file with 421keys,
Current implementation of checkkeys takes 300 sec.
This implementation of checkkeys takes 250 sec.
I implemented it as a separate command so it will be easier to compare between the old and new checkkeys.
Its also doing much on deviceside, which is a step to much funnier standalone modes :))
2017-10-05 16:00:56 +02:00
iceman1001
a4b4a1a9a2
FIX: iso-14443a RATS optional (piwi)
2017-10-01 22:06:06 +02:00
iceman1001
d412a8aa2c
FIX: one dot wrong
2017-09-28 22:33:26 +02:00
iceman1001
4dccc340ae
correcting the standalone addons pathing.
...
adding some comments on standalone problematics
2017-09-28 22:33:03 +02:00
iceman1001
1285f5a32c
minor adjustments. return instead of goto
2017-09-28 22:30:33 +02:00
iceman1001
2d283c42a6
FIX: ISO15, increased reading distance by letting tag some time to powerup.
2017-09-27 12:12:43 +02:00
iceman1001
834a80dcc1
chg: 'hf iclass sim' even with sim2, the card should answer to reads of block0,1,2 and 5
2017-09-26 17:06:13 +02:00
iceman1001
b0bf1faa3d
CHG: 'EMV' , at least it compiles, however working that is a completely different issue..
2017-09-19 19:49:47 +02:00
iceman1001
14550557be
CHG: 'emv compilation' since the client makefile doesn't import makefile.common anymore, need to move some compilor directive. Now need to change two files for EMV compilation.
...
* client/Makefile
* common/Makefile.common
2017-09-18 22:33:22 +02:00
iceman1001
28f1f23d48
chg: easy printing of MAKE variables
...
Usage::
make print-FLASHTOOL
cd bootrom; make print-APP_CFLAGS
cd client; make print-GCC_VERSION
2017-09-18 18:59:51 +02:00
iceman1001
3839ce006d
fix: added missing emv function. WITH_EMV compiles now.
2017-09-18 18:38:54 +02:00
iceman1001
f96afe0ce7
chg: emv compilation, will it work better on OSX?
2017-09-17 19:24:04 +02:00
iceman1001
b439c76c6e
CHG: changed name on define. Its now called CMD_UPLOAD_SIM_SAMPLES_125K .. Since we upload to device.
2017-09-14 11:13:10 +02:00
iceman1001
635636a267
chg: 'hf 15 sim' - made debugstatements optional (follows DEBUG flag now)
2017-09-14 11:09:21 +02:00
iceman1001
0c2c6f3fd7
CHG: 'hf mfdes info' : Now checks for 7b uid's. This will remove some faulty claims of tagidentifications.
2017-09-14 11:06:49 +02:00
iceman1001
98bc685632
add: 'hf iclass sim 4' - new mode, to adapt sim 2 to readers in keyroll mode.
2017-09-12 08:45:38 +02:00
iceman1001
e042ba5432
fix: BUTTON_PRESS needs...
2017-09-05 10:36:25 +02:00
iceman1001
2c1e2a9f3a
CHG: 'hf 15 findafi' - added the possibility to cancel loop with buttonpress
2017-09-05 10:31:27 +02:00
iceman1001
e69d070596
fix: 'hf 15 findafi' switch off antenna afterwards
2017-09-05 10:16:37 +02:00
iceman1001
f21555b1b2
fix: stack corruptions. keep it simple. (coverty scan 170498, 170497, 170496)
2017-09-05 10:10:24 +02:00
iceman1001
85b1c6bdfb
add: 'hf 15 list' is now possible, since I like to be able to call both "hf list 15" and "hf 15 list"...
...
chg: 'hf list 15' better annotations, the flags doens't define the command anymore
chg: device side, iso15, experimenting with different settings.
The tag still doesn't answer to 0x002B not 0x202B---uid--- commands.
2017-09-04 22:48:35 +02:00
iceman1001
ec07e2e006
FIX: 'hf 15 *' commands - the demod should work better now and as a bonus I've added some tracelogging. The timer is not quite correct yet but its a start.
...
sample:
hf 15 reader
hf list raw
2017-09-04 13:56:57 +02:00
iceman1001
eec5780b62
chg: minor clean up in iso15693 commands.
2017-08-31 13:24:12 +02:00
iceman1001
4d354f75fe
upd - CHANGELOG.md
...
chg 'hf iclass sniff' more debugstatements
2017-08-30 22:35:35 +02:00
iceman1001
a971c03877
chg: the version text layout
2017-08-29 08:46:26 +02:00
iceman1001
292a4ca602
'hf 14b sniff' - removed stuff which wasn't very useful. cleaner now. Not sure if it works :(
...
'hf iclass sniff' - playing with this one. Don't expect it to work yet :(
- increase dma_buffer_size to 256
- moved initialization to a own function. Just looks cleaner :)
- change the debug output to follow MF_DBGLEVEL
'hf mf sniff' - unnecessary cast removed
2017-08-27 19:41:24 +02:00
iceman1001
8581fec47c
...added the standalone folder..
2017-08-26 13:01:35 +02:00
iceman1001
fda4a25f51
and some more adjustments..
2017-08-26 12:59:10 +02:00
iceman1001
94f70caa7a
when you need to add too much changes at the same time...
...
fix: 'hf mf hardnested' test cases doesn't need to verify key.
add: 'hf mf ' - collect nonces from classic tag.
chg: switch_off on armside, a more unified way, so we don't forget to turn of the antenna ...
chg: renamed 'hf iclass snoop' into 'hf iclass sniff' in an attempt to make all sniff/snoop commands only SNIFF
chg: 'standalone' -> starting the work of moving all standalone mods into a plugin kind of style, in its own folder.
2017-08-26 12:57:18 +02:00
iceman1001
7810dac62d
CHG: not using the parity values for logging. Saves some few ticks :)
2017-08-21 23:34:11 +02:00
iceman1001
a7441c4bf6
CHG: added some more debugstatements,
...
CHG: 'hf iclass sim 2' use another e-purse value {0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff}
CHG: testing to see if we can skip the parity array when logging, we don't seem to use that information anywere anyway.
CHG: no need to check tracing global var, it is done inside of LogTrace function anyway
2017-08-21 17:22:22 +02:00
iceman1001
269b89373d
chg: testing another loop style
2017-08-21 17:18:24 +02:00
iceman1001
a8334d6ab3
chg: added some WDT_HIT calls
2017-08-21 17:17:43 +02:00
iceman1001
4eda2828c8
fix fiddling, it seemed most iclass commands never shut down the antenna after they were finished. I may have missed something.
2017-08-19 19:50:55 +02:00
iceman1001
823a814cf6
FIX: some possible null - ref bugs in 'iclass' , 'iso15693' deviceside.
...
FIX: 0 is not a reference.
FIX: iso15693 - wait wasn't implemented
chg: 'hf 15' getTagInfo_15 renamned.
chg: 'hf iclass loclass' some output got newline
2017-08-19 09:49:41 +02:00
iceman1001
db515ba6c4
chg: 'hf iclass sim' - turning of antenna after simulation is done.
...
chg: 'hf iclass sim' - use @holiman 's 8 csn instead of the original @carl55 (15), and a new first entry csn, to see if the old one got blacklisted.
2017-08-18 10:23:46 +02:00
iceman1001
eae8c2f7be
chg: unify debug messages for FSK demod in AWID,HID,IO,PARADOX,PYRAMID, all neat and same.
2017-08-11 20:48:54 +02:00
iceman1001
6ad546fa13
chg: removed extern on print_lock mutex. Since there is two of these, in proxmark3.c and ui.c
2017-08-11 11:40:25 +02:00
iceman1001
bd4d1ec74e
Fixes: lf simpsk - make sure Carrier input is ok.
...
fix: 'lf awid sim' - Clk param is used CorreCt
fix: 'lf HID sim' - unified way logging
fix: 'lf indala sim' - adding a draft simulation Command
fix: 'lf io sim' - unified way logging
fix: 'lf nedap sim' - getting bits is wrong still..
fix: 'lf paradox sim' - Helptext
lfdemod.C got some reworked loops, still some debug messages to be ...
2017-08-10 14:19:57 +02:00
iceman1001
f56d00bf1d
chg: 'lf sim' on deviceside, removed the usb_poll in one loop. Will look into @marshmellow42 limit also
2017-08-09 09:28:54 +02:00
iceman1001
9d8cfd13a7
NEW: cleaning up in the StandAloneMode mods.
...
'hw version' - added a function to print out which mods is installed on the firmware (deviceside)
New compiler flags are:
# -DWITH_ICEMAN
# -DWITH_LF_SAMYRUN
# -DWITH_LF_PROXBRUTE
# -DWITH_LF_HIDCORP
# -DWITH_HF_YOUNG
# -DWITH_HF_MATTYRUN
The code behind them are NOT in this commit. They will come in there own files later on.
2017-08-06 16:29:29 +02:00
iceman1001
722d8b2cdb
chg: more adjustments to iso15 sim
2017-07-31 18:24:53 +02:00
iceman1001
479a288543
chg: 'hf 15 sim' - now it loops until buttonpress or usb_received.
2017-07-31 17:55:21 +02:00
iceman1001
0a58e8f0fe
CHG: macro T5555_SET_BITRATE is used for clearity
2017-07-31 16:05:33 +02:00
iceman1001
91898babc0
FIX: data plot AutoCorrelate slider, window too big, now limited to number of samples.
...
enhanced debugstatements,
'lf em 410x_demod' vs 'lf em 410x_read' now read does the same as all other LF, and demod too...
2017-07-30 21:21:02 +02:00
iceman1001
bf5b7e2d91
coverity scan, uninitialized vars.
...
removed crapto1.
2017-07-30 10:33:40 +02:00
iceman1001
b3f787a64f
fixes: armside
2017-07-30 10:01:30 +02:00
iceman1001
f28da2da6e
monster merge...
...
all those changes marshmellow did.. and more...
2017-07-30 09:17:48 +02:00
iceman1001
208550823d
FIX: 'lf simulate' - wrong fix, the simulation doesn't work very well, but now it looks better...
2017-07-29 00:34:21 +02:00
iceman1001
9ca75c1cfd
disable some debug output
2017-07-28 03:00:28 +02:00
iceman1001
46a0ec7130
CHG: removed old TRUE/FALSE defines... some left still..
2017-07-27 09:28:43 +02:00
iceman1001
24d332fac7
fixes..
2017-07-11 18:27:59 +02:00
iceman1001
cdc0f15104
FIX: playing with some delays.
2017-07-11 17:40:29 +02:00
iceman1001
8bc17414fd
new coverity scan complains..
...
fix 'lf hitag' bit comparisions wrong
fix 'standalone mode' logically dead code
2017-07-07 15:45:40 +02:00
iceman1001
4406f4ee2a
CHG: removed some #DEFINE TRUE/FALSE
2017-07-07 12:52:51 +02:00
iceman1001
5f18400cbe
FIX: 'hf iclass reader' marshmellows fixes.
...
CHG: removing some #define TRUE
2017-07-07 12:38:49 +02:00
iceman1001
77c98eb2d7
FIX: 'hf standalone mode' - had some printing issues when printing a Uin64_t.
2017-07-07 12:34:57 +02:00
iceman1001
ce56dd32e3
FIX: 'hf mf c*' works both with 1a/1b generation of tags.
2017-07-07 12:34:20 +02:00
iceman1001
3ca3d401c0
FIX: some adjustments to prng detection
2017-07-04 20:11:25 +02:00
iceman1001
a7e677061a
FIX: 'hf 14a sim' - mifare ul-ev1 simulation didn't follow protocol, (thanks to @Vyacheslav for pointing it out)
...
ref: https://github.com/iceman1001/proxmark3/issues/110
FIX: 'hf 14a raw' - zero lenth commands and AppendCrc14443a doesn't work well together.
FIX: 'hf 14a raw' - made clear comments and making params comparing as it should be.
FIX: 'hf 14a raw' - when selecting tag, and it failed, the PM3 device was left with antenna on. This has now been fixed as it turns off antenna and leds.
2017-06-26 21:36:56 +02:00
akileos
1c1926a42c
Merge pull request #1 from iceman1001/master
...
Merge latest changes
2017-06-03 11:35:30 +02:00
Iceman
9f3d7bbe29
Update hfsnoop.c
...
Fix increment on bool variable (#294 ) (thanks to @ikarus23)
c87c452120
2017-05-29 09:49:02 +02:00
BOURDY Romain
7b8cbd38a8
Appveyor - Add strawberryperl / readline / libusb
2017-05-01 09:16:22 +02:00
iceman1001
f7639bc338
FIX: lf sim
was broken since my little tests. Should work again.
2017-03-27 14:59:49 +02:00
iceman1001
e1778858dd
FIX: lf hitag : Mea culpa, simulation should not have reader_field on. thanks to @Tiberius and @aczid for pointing out one of my mistakes from 2014.
2017-03-24 21:03:09 +01:00
angelsl
ece631fd06
Add Mifare Classic EV1 set load modulation command
2017-03-09 21:37:16 +08:00
iceman1001
57e1e31dce
chg: unused .. but not for long
2017-03-06 19:15:01 +01:00
iceman1001
57778a4630
CHG: renamed struct sector -> sector_t
...
CHG: defines on armside
CHG: #define WIN32 -> _WIN32
CHG: started to enhance "hf mf chkkeys"
REM: removed some duplicates etc in default keys.
2017-03-06 19:11:08 +01:00
iceman1001
8eeb3c6a0b
CHG: And that should be everything cleaned up with unneed functions and calls.
2017-03-06 11:53:55 +01:00
iceman1001
7dfa1b021e
CHG: breaking, forgot some..
2017-03-06 11:50:26 +01:00
iceman1001
00baf27097
FIX: since the correctionNeeded logic changed, with PR #87 ( https://github.com/iceman1001/proxmark3/pull/87 ) this is the consequence changes to it.
2017-03-06 11:27:15 +01:00
Timo Hirvonen
17ab9dcca0
Improved logic for determining the correct Frame Delay Time (FDT) value based on the last bit transmitted by the PCD
2017-03-06 11:39:12 +02:00
iceman1001
dfcf20d641
FIX: Coverity Scan fixes to emvcmd.c among others.
...
FIX: emclearmem bug.
2017-03-05 18:43:06 +01:00
iceman1001
bdeac4021a
CHG: @marshmellow42 's XL size, and em4x05 timmings.
2017-03-04 14:37:26 +01:00
iceman1001
99136c6eef
CHG: finalized the merge between peter filmoores 14atagfuzz branch (emv). I seriously doubt anything works.
2017-03-01 21:51:23 +01:00
iceman1001
c24364a8a4
FIX: @marshmellow42 's ST detection fix.
...
FIX: lfops.c and em4x05 command timings.
2017-02-28 19:20:12 +01:00
iceman1001
f24edfec54
CHG: hf 14a read
- started to add a Magic tag gen2 detection. SKipping it for now. Can't decide to put in on deviceside or in client.
...
FIX: `lf read` - ophs.. it works again.
ADD: `lf em 4x05--` - added a chipset definition
CHG: better kali fix - from @pwpivi
2017-02-28 08:16:02 +01:00
iceman1001
8db18d2f15
ADD: hf 14a read
- now can detect the newer magic generation 1b. In output 1A (old version, where all hf mf c* commands works) 1B is the newer.
2017-02-27 19:18:38 +01:00
iceman1001
aa5cba4ca3
CHG: coverity scan cpmplains..
2017-02-26 00:40:19 +01:00
iceman1001
d24026ade8
BUG: forgot to remove
2017-02-25 23:14:55 +01:00
iceman1001
d32691f1da
FIX: hf mf sim
- authentication works again.
...
CHG: `lf em`- renamed.
CHG: removed functionality in whereami.c, not needed.
2017-02-25 23:00:20 +01:00
iceman1001
17556415a9
CHG: @marshmellow42 's changes to lfops.c /lfsampling.c
...
CHG: updated CHANGELOG.md
2017-02-24 15:45:24 +01:00
iceman1001
5215a87442
CHG: @Marshmellow42 's fixes. ref: e88096ba25
2017-02-24 01:14:47 +01:00
iceman1001
07bc72b880
CHG: continue code cleanup.
...
REM: removed stdint.h , since we are using c99 when compiling.
2017-02-23 00:32:14 +01:00
iceman1001
9c624f67b3
chg: @piwi's code cleanup and some more.
...
ref: 43534cbad2
2017-02-23 00:03:10 +01:00
iceman1001
4ac9f07840
CHG: lf em
- added @marshmellow42 's changes
2017-02-19 00:12:35 +01:00
iceman1001
c930078036
FIX: wrong variable name.
2017-02-15 02:46:09 +01:00
iceman1001
1bfbe92a53
FIX: coverity scan found some bugs in EMV code. These are the fixes to:
...
-CID 141293 - missing va_end call
-CID 141290 - return var not always given a value
-CID 141289 - array out of bounds write. off by one.
-CID 141288 - dead code because of CID 141287
-CID 141287 - wrong mask
-CID 141286 - wrong mask value
2017-02-15 02:44:34 +01:00
iceman1001
573e8d72c7
FIX: 'EMV compiling' - Makefiles are very picky about how things are done. its parser is a bit paranoid. So, to make things easier and more correct.
...
- armsrc/Makefile when commenting out functionality, move it below the comment otherwise APPS_CFLAG breaks to early. See WITH_LCD
- common/Makefile.common enable / disable EMV, uncomment two lines. then make clean && make all. flash, MIGHT NOT work on 256kb devices
FIX: missing break in appmain.c made it go to iclass function..
2017-02-13 15:32:48 +01:00
iceman1001
4c8fe2e976
CHG: some minor adjustments.
2017-02-13 11:06:30 +01:00
iceman1001
ff9c043da2
FIX: T5555/Q5 datarate when used in "Q" parameter, consequential fix in lf commands. (RF-2/2) ie: ((64-2)>>1)
...
ADD: Marshmellow42 's timing fixes for em4305.
2017-02-13 10:58:28 +01:00
iceman1001
cb1ba30a5e
FIX: first attempt to clean up EM4x50 commands.
...
- `lf em4x readwordPWD` merged into `lf em4x readword` See help text
- `lf em4x writewordPWD` merged into `lf em4x writeword` See help text
- `lf em4x readword` now download the collected signal data after command.
On device side the lfops.c has gotten some love. Code cleaner, increased EM_START_GAP from 55 FC to 56 FC, because of how our microsecond(us) clock works with 21.3us increments.
TODO: `lf em4x em4x50read` needs to be factored to use @marshmellow42 's ASKdemod instead of trying to do itself.
2017-02-07 22:26:06 +01:00
iceman1001
5ed5e418c9
CHG: testing to set 460800 baudrate as default, if it fails, go to 115200 baudrate. For Linux/Win. Works great in my environments.
2017-02-06 02:33:08 +01:00
iceman1001
1903696e2a
chg: uncomment -DWITH EMV to compile for EMV.
2017-02-06 00:57:31 +01:00
iceman1001
60ca588725
syntax sugar
2017-02-06 00:51:06 +01:00
iceman1001
d627a2fd8c
FIX: commented code screws up notepad++ groupings.
2017-02-06 00:50:37 +01:00
iceman1001
a32e8034e0
FIX: get rid of de-referecing pointer warnings.
2017-02-06 00:49:32 +01:00
iceman1001
6a1687cc3e
ADD: 'hf emv' - forgot to add some file
2017-02-05 22:16:50 +01:00
iceman1001
3e83ff2159
CHG: '-DWITH_EMV' - fixing some compilation errors when compiling with peter fillmore's emv code. Warning a 256kb Proxmark3 device will only have 7% memory left if you enable this
2017-02-05 21:09:36 +01:00
iceman1001
a330987de1
CHG: 'lf cotag demod' - now finds FC/CN Thanks to @marshmellow42
...
CHG: 'lf search' - now detects COTAG
2017-02-02 19:15:36 +01:00
iceman1001
5f5b83b743
ADD: 'lf cotag read' - COTAG can be read now.
2017-02-02 15:32:21 +01:00
iceman1001
4401050bcc
ADD: 'hf standalone 14a mode", added "mifare 4k" detection.
...
ADD: 'hf 14a sim' - added mifare 4k simulation.
2017-02-01 14:41:06 +01:00
iceman1001
507afbf3e6
CHG: 'lf cotag read' - it now follows "lf config" settings when collecting signaldata.
2017-02-01 14:11:11 +01:00
iceman1001
d760c7b3d9
FIX: 'standalone_14a mode' - cleaned up the standalone14a mode code. It now detects and simulates 4,7byte uids, like it should. code refactored to be easier to understand.
2017-02-01 14:09:26 +01:00
iceman1001
16cfceb689
CHG: rename a local scope variable "data"->"cmd"
...
CHG: call params to selectcard too few
CHG: 'standalone HF mode' - when copying second UID onto data array, it should append after first one, not over the first one.
ref: https://github.com/iceman1001/proxmark3/issues/77 Lets see if this fixes the HF part of this issue
2017-02-01 12:50:54 +01:00
iceman1001
b828a4e168
CHG: 'lf snoop' - now automatically downloads samples after finished. (annoying step to do over and over)
...
FIX: 'lf snoop' - now turns of LF antenna after snoop.
FIX: 'lf cotag read' - now waits until the ACK cmd arrives before downloading samples.
2017-01-31 16:11:57 +01:00
iceman1001
84bdbc1917
FIX: 'hf 14a sim x' - adjusted and shows messages when verbose.
...
FIX: 'hf mf sim x i' - same as above.
In general we only use Moebius attack for "sim x", that means a clean up on device side code. simpler to understand. It still tries to gather 8 different collections of nonces combo. When one is complete, it get sent to client which runs moebius direct.
2017-01-29 23:09:23 +01:00
iceman1001
7e735c1398
FIX: 'hf 14a sim x' - this fixes the error with using moebius attack and sim. Updating the nonce variable doesn't change the premodulated response. And it should update everytime it gets a command. One concering issue is that this takes time. Successfully works with two PM3. One acting reader, another sim.
2017-01-29 11:29:15 +01:00
iceman1001
e99acd00cc
CHG: the mifare Auth command can make use of a random nonce aswell.
...
CHG: since sim commands are timing critical, I'm testing a smaller prand prng function from Intel
2017-01-29 10:41:48 +01:00
iceman1001
4653da4331
ADD: lf cotag
- added first try at basic functionality to read samples from Cotag. In lfops.c is the startup sequence that needs to be tested out.
2017-01-27 10:49:34 +01:00
iceman1001
74dde713b1
CHG: should remove the OSX linker warning: ld: warning: directory not found for option '-L/opt/local/lib'
2017-01-26 21:13:17 +01:00
iceman1001
2d3f8e5fa7
ADD: some defines to make headerfiles behave better.
...
CHG: syntax sugar
2017-01-26 14:23:05 +01:00
iceman1001
bf5d7992ce
ADD: @micolous random nonce, adjusted to fit in. Icemanfork only uses Moebius attack, so no need for an extra parameter in client.
...
ref: https://github.com/Proxmark/proxmark3/pull/209
2017-01-26 14:21:51 +01:00
iceman1001
de39bf505a
CHG: moved some from THUMB to ARM.. Looks like usb communication became bad.
2017-01-25 13:00:49 +01:00
iceman1001
0ccf8adac4
CHG: moved to header file
2017-01-25 00:34:00 +01:00
iceman1001
53d5dc643f
CHG: fiddled with the headerfiles... and makefile... Tried to make them behave nice. So it isnt a hell to add new functions from third-party (like des, aes etc)
...
Added a lot of #ifndef , extern C,
Move inside from ARMSRC -> THUMBS, which made the compiled image smaller.. I don't know if it broke anything.
Moved MF_DBGLEVEL definitions into common.h
Moved print_result from util.c into appmain.c
Also split up some struct typedef into header files so they could be reused in other code places.
''' danger ''' this might have broken stuff...
2017-01-25 00:33:03 +01:00
iceman1001
0de81725ed
syntax sugar
2017-01-21 11:34:33 +01:00
iceman1001
0f7279b22d
syntax sugar
2017-01-21 11:33:14 +01:00
iceman1001
7dcd37fc2e
chg: moved to header file
2017-01-21 11:29:16 +01:00
iceman1001
0062cc1ca1
removed unneeded include
2017-01-21 11:21:05 +01:00
iceman1001
5b749dcb0e
CHG: moved to header file
2017-01-21 11:20:26 +01:00
iceman1001
8be98f12e9
syntax sugar
2017-01-21 11:07:44 +01:00
iceman1001
897a14c36f
CHG: moved to header file. common.h has RAMFUNC definition
2017-01-21 11:06:48 +01:00
iceman1001
3c345a41b2
chg: moved to header file
2017-01-21 10:35:59 +01:00
iceman1001
8ce95353de
CHG: moved to header file
2017-01-21 10:34:00 +01:00
iceman1001
405944a0ac
CHG: moved to header file
2017-01-21 10:31:54 +01:00
iceman1001
5e1de05ab0
chg: moved to header file
2017-01-21 10:29:49 +01:00
iceman1001
0eea62d4c3
CHG: moved to header file
2017-01-21 10:29:21 +01:00
iceman1001
15d4bf3e78
CHG: moved to header file
2017-01-21 10:28:14 +01:00
iceman1001
e04f23fabf
CHG: moved to header filer
2017-01-21 10:27:06 +01:00
iceman1001
995c94dc03
CHG: moved to header file
2017-01-21 10:25:29 +01:00
iceman1001
00e524aaf5
CHG: moved to header file
2017-01-21 10:24:06 +01:00
iceman1001
69784c3801
ADD: 'lf search' - added @marshmellow42 's hitag2 identification
2017-01-20 10:09:06 +01:00
iceman1001
9aeda6cbfb
FIX: coverity scan error CID 121781, unused value. error 0x88 will be overritten by 0x00 directly. Don't know if this 0x88 will bug stuff out.... *wildside commit*
2017-01-19 20:21:21 +01:00
iceman1001
10493a0f19
CHG: fix covertyscan error CID 133851, Cardstate can't not be SIM_NOFIELD when it arrives to that switch statement.
2017-01-19 20:18:21 +01:00
iceman1001
42c235e7ef
ADD: T55XX_WRITE_TIMEOUT to make sure all WaitForResponseTimeout for t55xx behaves the same.
...
CHG: removed some "DONE!" device prints..
CHG: unified some "clone" commands output.
2017-01-18 22:54:27 +01:00
iceman1001
1c07ca92c3
CHG: removed a delay in readblock
2017-01-16 22:38:31 +01:00
iceman1001
81b7e89434
CHG: lowered the number of bytes collected for T55xxReadBlock. Was 12000 -> 7679
...
CHG: added some documentation about what arguments does.
CHG: 'data tune' - added flush after printf.
2017-01-16 21:06:51 +01:00
iceman1001
aed36ae5bd
ADD: 'install.sh' blacklist rules installed aswell. run as root to install.
2017-01-16 15:02:10 +01:00
iceman1001
f133389866
CHG: download data from device to client, make a debugstatment when send command failed.
2017-01-16 14:48:26 +01:00
iceman1001
701ad7cb3a
chg: syntax sugar
2017-01-11 23:11:55 +01:00
iceman1001
dd83c4572b
CHG: coverity complains about not reading the value from mifare_send_short
...
CHG: ubuntu 14.04 gcc4.8.4 complains about mem_avail still. Don't know why.
2017-01-09 22:15:36 +01:00
Iceman
6fe5fe8d52
LF sim
...
`lf sim` - use config values for setting the frequency.
2016-12-25 15:25:33 +01:00
iceman1001
55db344f97
CHG: used @marshmellow42 's version to fix lf continuous demod problems.
2016-12-19 16:04:27 +01:00
iceman1001
e4b65f5bc1
CHG: mental note to self, capslock is bad.
2016-12-19 12:53:38 +01:00
iceman1001
61d36d3695
FIX: 'LF IO FSKDEMOD' - no call to turn of the antenna when exit
...
Thanks to @samyk
https://github.com/Proxmark/proxmark3/issues/203
2016-12-19 12:51:21 +01:00
iceman1001
501c666b10
FIX: 'lf hid fskdemod' - no turning of the antenna afterwards.
...
FIX: 'CMD_AWID_DEMOD
Thanks to @samyk
ref: https://github.com/Proxmark/proxmark3/issues/203
2016-12-19 12:48:27 +01:00
iceman1001
f7e98f1fb6
FIX: 'iclass write'
2016-12-07 17:43:13 +01:00
iceman1001
5b8167fb97
FIX: 'iclass write'
...
thanks to prof_abrasive && go_tus
ref: http://www.proxmark.org/forum/viewtopic.php?id=4033
2016-12-07 17:07:23 +01:00
iceman1001
77f3f9ff5c
CHG: "hf mf hardnested" device side should empty bigbuff?
2016-11-16 17:44:08 +01:00
iceman1001
5fba8581f4
CHG: the reset of pcb_num should be before untraditional tags return.
2016-11-16 17:43:08 +01:00
iceman1001
0b53530a10
CHG: "hf mf hardnested" disabled the tracelogging on deviceside during nonce acquiring.
2016-11-07 22:42:57 +01:00
iceman1001
325f26e25d
CHG: removed unused variable
2016-11-03 15:15:25 +01:00
iceman1001
3a051ec10b
CHG: don't consider the respons at all when sending the HALT command.
2016-11-03 15:00:17 +01:00
iceman1001
d209443322
CHG: 'HF MF C*' (chinese backdoor commands) According to douniwan5788 some magic/clone tags answers to the halt cmd and some not. I think I captured his ideas.
...
ref: 13b71e58fd
2016-10-28 20:43:07 +02:00
iceman1001
30daf914ce
FIX: looping logic error, doesn't need to increase with 1, if we do 8 checks every turn...
2016-10-28 13:06:34 +02:00
Michael Farrell
b6e05350b2
hf mf sim: Multiple fixes (iceman1001/proxmark3 #45 )
...
- Fix `hf mf sim` to use nonce_t structures, so key recovery works
- Increases verbosity on the key recovery functionality
- Fix use-after-free for k_sector
- Add help info on `e` option to `hf mf sim`
2016-10-22 21:53:53 +11:00
iceman1001
2dcf60f3df
CHG: "hf mf hardnested" - less printing
...
CHG: some filehandles = NULL.
2016-10-21 16:06:53 +02:00
iceman1001
67cd89033c
CHG: experimenting with 'lf sim' It does send a signal now but...
2016-10-20 17:31:58 +02:00
iceman1001
c528cf3989
TEST: see if the readerfield is needed.
2016-10-20 01:52:26 +02:00
iceman1001
c50259b36a
CHG: added a quitting message
2016-10-20 01:13:18 +02:00
iceman1001
8fd25db30c
CHG: move the call to fpga_bitstream_lf, in order to save the uploaded data from the client. Changing bitstream wipes bigbuffer.
2016-10-20 01:06:17 +02:00
iceman1001
3b5aab1875
CHG: updated some comments. I still think I don't understand this code
2016-10-20 00:42:17 +02:00
iceman1001
f4d7d1fed1
CHG: removed CLOCK2, since its not used in the code.
2016-10-20 00:40:56 +02:00
iceman1001
f0a96745d0
CHG: the AT91C_BASE_PMC->PMC_PCER has a tendecy to be clear when set with "=", but my tickstimer also needs it, so I made it optional now.
2016-10-20 00:40:24 +02:00
iceman1001
49065576ad
FIX: lf sim, seems like "lf sim" call SimulateTagLowFrequency direct from appmain.c and I removed the LF bitstream call thinking SimulateTagLowFrequency was only called from the sub FSK;ASK;PSK commands.
2016-10-20 00:39:15 +02:00
iceman1001
8fd0a564e5
CHG: removed unused clocks,
...
CHG: now uses the DEFINEs instead. a bit clear
CHG: xor in the clocks, should allow for co-exist with SSP clock.
2016-10-19 21:26:29 +02:00
iceman1001
8255e1a685
CHG: just changed the comment.
2016-10-19 21:25:04 +02:00
iceman1001
29ff374e5d
CHG: TI code did have the tickstimer started.
2016-10-19 21:24:20 +02:00
iceman1001
c3fc86d9af
CHG: Xoring in the value allows for the ticks timers to co-exist. Or that is the idea.
2016-10-19 21:23:03 +02:00
iceman1001
4460be68c3
FIX: "lf sim" after changes to ticks timers on device side, there was a "starticks" call missing, which lead to not having any timers which is a problem for the WaitUS call.
2016-10-19 19:59:58 +02:00
iceman1001
b069fb8bba
syntax suger
...
and forgot to add method declaration to headerfile
2016-10-14 15:47:40 +02:00
iceman1001
c7b4bcc4ab
CHG: syntax suger
2016-10-10 21:53:44 +02:00
iceman1001
f8ff1483eb
CHG: "hf legic sim" old imp, uses two timers, we have one. I'm seriously starting on thinking about a UART instead, to read the dmabuffer. If only I knew howto.
2016-10-10 21:52:58 +02:00
iceman1001
c2723575de
CHG; added an option wither or not to clear emulator mem on init
2016-10-09 18:24:51 +02:00
iceman1001
539fd59ebe
CHG: "hf legic write" - now writes on the limits better.
...
CHG: "hf legic restore" - now restors :)
CHG: "hf legic rdmem" - now has a nice offset row above the read data. try: 'hf legic rdmem 0 100'
2016-10-09 15:41:31 +02:00
iceman1001
cd79d97223
CHG: syntax suger
2016-10-08 19:14:35 +02:00
iceman1001
8ddfbc34dc
CHG: the call to TurnReadLFOn has a delay / number as parameter. Seems to be gone.
...
FIX: fixes to EM4050 code since when I changed the timer. It should work nice now.
2016-10-08 19:12:51 +02:00
iceman1001
7e7d3de5fa
FIX: looks like "hf legic write" works again!
2016-10-07 23:07:59 +02:00
iceman1001
4409bf6ef3
CHG: "hf legic write" with these I managed to get one byte written. Its a start.
2016-10-07 22:16:38 +02:00
iceman1001
715bed5023
CHG: adjustments to 3.6ms
2016-10-07 21:28:09 +02:00
iceman1001
c2ab5e8c4e
FIX: "hf list legic" annotation now correct prints byte and value for "legic write" command
2016-10-07 20:23:57 +02:00
iceman1001
e4d57949df
FIX: wrong log bytes...
2016-10-07 19:15:08 +02:00
iceman1001
b816886806
FIX: one send command bug fixed. Turns out that uint16_t is too small for 21/23bits size. Who figured?
2016-10-07 19:11:38 +02:00
iceman1001
27c4a862f6
FIX: unused variable removed.
...
CHG: start remaking the used timers in "Hf legic write"
2016-10-07 12:23:07 +02:00
iceman1001
f0fa663814
CHG: "hf legic write" got a make over in how its called. Now called with 'offset' and 'data'
...
'hf legic write o 10 d 11223344' - this will write 4 bytes (0x11,0x22,0x33,0x44) to tag from offset 10 (0x0A)
2016-10-07 11:58:14 +02:00
iceman1001
e4a8d1e2ac
CHG: started the process of fixing "hf legic write" and "hf legic sim" commands.
2016-10-07 00:15:47 +02:00
iceman1001
d41efbf21b
ADD: added a StopTicks functions, to disable the timer used for ticks (TC0, TC1)
2016-10-07 00:13:09 +02:00
iceman1001
0e8cabed8d
ADD: "hf legic eload" - Load binary file to emulator memory. Use "h" for help text
...
ADD: "hf legic esave" - Save emulator memory to binary file. Use "h" for help text
2016-10-06 19:13:23 +02:00
iceman1001
9015ae0f5d
CHG: "hf legic dump" now automatically detects tagtype and dumps accordingly.
...
CHG: still #define codestyle should it be with or without semicolons?
2016-10-05 22:58:06 +02:00
iceman1001
b1cd7d5ca6
FIX: one too many semicolons for #defines
2016-10-05 22:18:26 +02:00
iceman1001
00271f774a
FIX: undeclared var on deviceside,
...
FIX: "hf legic dump" is almost there.
2016-10-05 22:07:32 +02:00
iceman1001
633d068682
CHG: command name changes..
...
old "hf legic info" is now "hf legic reader"
old "hf legic read" is now "hf legic rdmem"
old "hf legic decode" is now "hf legic info"
ADD: new command "hf legic dump", which will autodetect tagtype and dump all mem to a binary file.
2016-10-05 21:42:13 +02:00
iceman1001
635d6e9bef
CHG: code clean up
2016-10-05 17:10:29 +02:00
iceman1001
c15e07f11d
CHG: making timings a bit tighter == faster read of tag. Like 1ms for whole tag.
...
FIX: off-by-one bug in read-byte-loop.
2016-10-04 23:08:39 +02:00
iceman1001
7a8db2f678
CHG: "hf legic read" - increased timeout values client side, reading MIM1024 takes a bit of time
2016-10-04 21:26:19 +02:00
iceman1001
86087eba00
Textual changes in helptext. Still no clear.
2016-10-04 18:43:11 +02:00
iceman1001
7bc3c99e7e
CHG: "hf legic write" started to change this command to the updated code
2016-10-04 18:05:55 +02:00
iceman1001
77a689dbeb
CHG: revert legiccrc8 to old algo.
...
CHG: "hf legic decode" now loads EML memory
CHG: legic timings is better.
2016-10-04 00:07:07 +02:00
iceman1001
0b0b182fe2
CHG: changed to use BigBuff_Eml memory instead of big_buff_malloc.
...
CHG: downloading eml memory from device should use uint's
CHG: "hf legic read" has a different printing. It now prints 32bytes / row
2016-10-03 23:24:59 +02:00
iceman1001
c649c43389
CHG: finally, the ticks timer does what it is supposed to do. 32bits and working.
2016-09-29 21:36:43 +02:00
iceman1001
fabef615ec
CHG: added addresize to legic select struct.
...
CHG: TIMER, it turns out the TC0, TC1 and TC2 is only 16bit. So adjust to use two clocks to get a 32bit timer.
CHG: code clean up in legic device side. consistency with variable names..
2016-09-29 17:43:39 +02:00
iceman1001
cb7902cdcd
CHG: removed some debug data
...
CHG: reverted back to old crc imp.
2016-09-29 14:46:12 +02:00
iceman1001
a39944216d
CHG: a select_legic function with structs and stuff and
2016-09-29 12:23:09 +02:00
iceman1001
d7e24e7c5f
CHG: 'hf list legic' doesn't print the parity now.
...
CHG: 'hf legic read' the device side timings is starting to look much better. HUGE Thanks to @will-rbnt for endless checks and logic analyser feedback. Without his effort this would not work. What does work? We can now use ANY IV in legic. The PM3 Master version is flawed, will only work with IV=0x55.
---still broke--- my crc implementation.. I know I'm about to look into it.
2016-09-28 21:37:08 +02:00
iceman1001
584e28e54b
CHG: Minor tweaks, the tracing dissappeared, the spindelay for powering up too long.
2016-09-26 21:40:05 +02:00
iceman1001
62577a62ae
FIX: Much of my added extra legic code is commented away now.
...
FIX: the gcc6.1.1 warning broke my gcc 4.8.4 build env..
2016-09-26 20:21:31 +02:00
iceman1001
3e750be37c
ADD: started to add a legic detection to "HF SEARCH"
2016-09-26 20:01:23 +02:00
iceman1001
faabfafe30
CHG: using bitsend to determind the legic annotation in "hf list legic" makes false positives much less.
2016-09-26 12:26:37 +02:00
iceman1001
e1deabc0eb
CHG: fixes a "indent" warning
2016-09-26 11:04:04 +02:00
iceman1001
25d52dd261
CHG: according to measureement by @wilrn the actual timing for receiving tag data, is 90us (ONE) and 100us (ZERO) which is not mentioned anywhere before. What a find!
2016-09-24 15:15:24 +02:00
iceman1001
d5bded10e2
CHG: lowered the timout again, but re-added the spindelay since 14a requires 5ms powerup before entering the idle-state where tag starts to listen.
...
CHG: fix the ticks compare xx > 1 into xx >= 1
2016-09-23 23:23:17 +02:00
iceman1001
f885043422
FIX: "hf 14a read" / "hf mf *" / "hf mfdes info" and failure when calling these commands serveral times in row.
...
For long transactions the sspclock compare with >1 instead of >=1 .. Now the timer resets properly.
CHG: use some #define constants for iso-commands.
2016-09-23 21:28:07 +02:00
iceman1001
24c49d36ba
FIX: This commit fixes the broken LF since I change the spindelay calls. The original problem is that spindelayus calls is incremented with21.3us each step, making it very hard to find exact timings found in the datasheets for T55x7, HID etcetc. When @marshmellow and I looked into this 2014, I had this on my back of my mind but forgot it since I didn't know how the source code / pm3 worked. This behavior in spindelayus has given the bit-period for ON/OFF measured in (us) very hard to find. Its kind of magic that it worked so far so good. Well until I started to look into the "hf legic" bitbanging ASK ON/OFF keying and that one needs a much more precis timer. Same goes for the PCF7931 code.
...
I've added a precise timer in the new files ticks.c and moved some older stuff from util.c to have a solid base for this.
UNTESTED, and the timings measured for t55x7 in lfops.c and other parts has not been adjusted to this "correct" timer.
2016-09-23 16:35:26 +02:00
iceman1001
22f4dca88c
CHG: extracted some timers functionality, to get unified access to a timer/clock which counts in ticks. Moved stuff from util.c
2016-09-21 19:03:32 +02:00
iceman1001
87342aadbc
CHG: adjusted timing according to @sentinel 's traces
2016-09-14 16:18:04 +02:00
René Werner
1cb9b2a3cf
used tabs instead of spaces
2016-09-13 21:04:13 +02:00
René Werner
78f59945a7
fixed indentation to get rid of warnings
...
warnings are treated as errors, so a warning due to misleading
indentation is kinda annoying
2016-09-13 20:57:25 +02:00
iceman1001
111c6934d4
CHG: Small steps, the waiting time between frames was unclear. At least now the tags answers to a readbyte command after the setup phase.
2016-09-12 09:19:49 +02:00
iceman1001
76471e5d17
CHG: reverted back from the idea of measureing in (us) microseconds, the timer is too raw, gives 10-15us delays. Now we are measuring ticks, which is (1 us = 1.5ticks)
...
like it was before. ie: 80us = 80*1.5 = 120ticks.
2016-09-11 11:14:12 +02:00
iceman1001
db44e049b0
CHG: this timing should be quite good. needs to be verified.
2016-09-10 22:47:11 +02:00
iceman1001
b4a6775b5e
CHG: a better micro second (us) spindely function. At average it has 8-10us delay, but its linear. Making error less when you want to wait longer..
...
SpinDelayCountUs(20) gives a delay of 28us.
SpinDelayCountUs(100) gives a delay of 110us.
SpinDelayCountUs(500) gives a delay of 508us.
2016-09-10 21:43:08 +02:00
iceman1001
5d15891e2b
FIX: Even the US clock had the issues with not resetting properly. Now its always ZERO when you call StartCountUS.
2016-09-09 11:57:31 +02:00
iceman1001
ad5bc8cc8c
In my attempts to make the LEGIC code better, its not working now. Timings if off.
...
CHG: switching to US clock.
CHG: better trace annotation for legic
CHG: Legic prng can now give a x bits in once.
2016-09-09 11:56:20 +02:00
iceman1001
f7b4257301
FIX: the acknowledgement response in setup phase now deals with MIN22, MIN256, MIN1024 tag accordingly.
2016-09-03 12:18:02 +02:00
iceman1001
c71c5ee156
ADD: started to add tracelog in legic
...
ADD: remake of legic codebase.
ADD: started with a annotation for LEGIC in 'hf list'
2016-09-02 16:25:54 +02:00
iceman1001
ab1112796e
CHG: removed call to bigbuff free.
2016-09-01 20:31:22 +02:00
iceman1001
2deea574d3
CHG: reverting use of bigbuff, because I forgot that every switch between LF/HF images destroys BigBuff.
2016-09-01 00:52:54 +02:00
iceman1001
05aff802ae
CHG: removed a redundant include to strings.h, which made compilation errors on OS X
2016-08-31 22:10:06 +02:00
iceman1001
cc70dd6b60
FIX: should fix the typedefintion error for OS X regarding bool cmd_send
2016-08-31 21:11:57 +02:00
iceman1001
153a4a78fe
CHG: the loop in main, for usb_poll_validate_length, shouldn't do anything, it should be done inside the next call to usb_read...
2016-08-31 19:22:52 +02:00
iceman1001
8d61d9b114
CHG: this timeout doesn't influence the bad performance with my older pm3 device (green pcb). I think its too slow.
2016-08-31 19:18:48 +02:00
iceman1001
be818b1417
FIX: Forget that the prng was 0x8000 length and not 0xFFFF. Sorry. Also returned to the decomposed loop. Don't know if this armsrc optimises this at compilation time. Does someone know?
...
CHG: returned the iso14443a_setup order, it might influence my older PM3 device.
*Note* my Elechouse revisions PM3 works great with this but my older xpfga (green pcb) is hopeless. It can't fix onto the nonces in 'hf mf mifare' I think its too slow.
2016-08-31 19:17:39 +02:00
iceman1001
cc70889743
FIX: fixes the broken build,...
...
FIX: increased the timeout, to make 'hf mf chk' work better.
2016-08-26 17:17:40 +02:00
iceman1001
f121b478a1
FIX: 'lf awid bruteforce' cleaning up all debug messages
2016-08-26 16:35:30 +02:00
iceman1001
ed8c2aeb63
CHG: forgot a semicolon...
2016-08-24 15:05:10 +02:00
iceman1001
bcacb3168b
CHG: removed some extra time to sync,
...
CHG: first_try , it must recalibrate all the times when it comes from the client.
2016-08-24 15:01:36 +02:00
iceman1001
63a1d80130
FIX: the underlaying bug on deviceside code. The SSPCLOCK wasn't reset to zero sometimes. More specific, TC2 wasn't reset cause all sorts of timing issues for the device side randomly. Like 'hf mf mifare', like iclass, like 'hf mf sim' etc etc.
2016-08-24 12:37:31 +02:00
iceman1001
f38cfd6693
CHG: fixed the collapsing comments when opening this file in notepad++ Need spaces between // text or /* ...
2016-08-24 12:34:34 +02:00
iceman1001
4c44d88500
REM: removed an test function
2016-08-24 12:32:43 +02:00
iceman1001
6067df30c5
FIX: at least now the special zero parity attack, repeats and doesn't crash. However it doesn't find the key either :(
2016-08-10 10:55:29 +02:00
iceman1001
86db8973b0
CHG; still looking at 14b, this time started to look at the tracelog times not working.
2016-08-09 23:13:18 +02:00
iceman1001
c2df2883f8
fix: forgot something small.. sloppy.
2016-08-07 22:15:35 +02:00
iceman1001
29f8c2cc15
ADD: added the 'max frame size' parameter set, valid sizes: 16|24|32|40|48|64|96|128|256
...
it can be verified by setting debuglevel to 3 or more.
2016-08-07 22:05:10 +02:00
iceman1001
d8b7a5f294
CHG: applied some of the changes unto "hf 14b snoop" *untested* Hard to test without a proper reader/tag to snoop
2016-08-07 18:49:36 +02:00
iceman1001
b86225188e
CHG: iso14443b.c got some more love. using the "hf 14b raw" command gives now a much stabil read from more distances than before.
2016-08-07 17:49:33 +02:00
iceman1001
df007486f5
ADD: @donwan581 select keytype for the darkside attack.
2016-08-04 21:51:26 +02:00
iceman1001
6b23be6b7e
CHG: cleaning up.
2016-08-04 21:37:43 +02:00
iceman1001
0f6e6b9acb
FIX: coverity scan 133859 structually dead code, looks like this is a rest from and old loop. I just removed it.
2016-08-03 10:53:26 +02:00
iceman1001
c23d2618ba
FIX: mental note to self, don't code when tried. "size" should have been "sizeof". I need to fix my build for armsrc again.
2016-08-03 00:51:26 +02:00
iceman1001
65cdf0e3f9
FIX: Coverity scan 1333852, Make sure (card) is not null before accessing it.
2016-08-03 00:39:02 +02:00
iceman1001
c3e8413c2b
CHG: Some testing of timings on 14443b,
...
FIX: CoverityScan 133854 , out-of-bounds read, when calculating crc.
2016-08-03 00:35:14 +02:00
iceman1001
3e82f956d8
FIX: COverityScan 133865, out-of-bounds access, Forgot that bits is not used in Logtrace but bytes.
2016-08-03 00:25:53 +02:00
iceman1001
bf2cd64406
fix: CoverityScan 133855 -out-of-bounds bits was used as index to cmd array.
2016-08-02 16:04:03 +02:00
iceman1001
955228691e
REM: cleaning up some commented code.
2016-07-30 19:36:48 +02:00
iceman1001
d0724780ab
FIX: Found a minor bug in 'LF CMDREAD' where it on device side didn't compare with the right char 'h' instead of 'H'. Re-wrote that whole part anyway, I changed periods to be max 0xFFFF in length, doubtful that a zero or one delay will be bigger than 65535...
2016-07-30 19:30:53 +02:00
iceman1001
ab3af4fe85
CHG: forgot to add the reflect function
2016-07-28 21:45:00 +02:00
iceman1001
3e134b4c20
CHG: merged the forum user @jason 's fixes to LEGIC. *UNTESTED*
...
CHG: changed the CRC implementations.
2016-07-28 21:41:44 +02:00
iceman1001
b9b480d081
chg: name error?
2016-07-07 10:01:50 +02:00
iceman1001
a8ee668770
CHG: moved includes into header file where it belong
2016-07-07 02:15:40 +02:00
iceman1001
0a856e292a
CHG: adjusted the debug message to the correct mfkey32v2 with right number of parameters.
2016-06-22 09:35:18 +02:00
iceman1001
118bf0c203
ADD: added a comment about Q5 settings. needs to be verified
2016-05-16 21:41:19 +02:00
iceman1001
6a4271d186
CHG: Changed cardnumber printing from %d (signed) to %u (unsigned) for AWID50, it now prints correct in all cases. Thanks to @ntk for reminding me about it.
2016-05-14 14:34:35 +02:00
iceman1001
c5e8b91696
ADD: AWID 50bit demod
2016-05-13 22:52:25 +02:00
iceman1001
60e26e50c5
FIX: changed from ssized_t -> size_t
...
FIX: changed off_t -> size_t
2016-05-09 08:27:55 +02:00
iceman1001
e46642ca4c
REM: commented out a reference to Logtrace in bigbuf.c, since its already declared as "extern" in bigbuff.h
...
Lets see if this reduces compilation errors for Mac OS X users.
2016-05-08 18:52:19 +02:00
iceman1001
048324d63b
DEL: removed the homebrews script. It needed a seperate gitproject.
...
CHG: removed references to stdio.h and time.h in ARMSRC.
2016-05-06 23:51:03 +02:00
iceman1001
7680db569c
CHG: test to remove a call <sys/types.h> seems to be conflict with mac os x...
2016-05-06 20:09:10 +02:00
iceman1001
b070f4e495
CHG: only need a byte in this loop
2016-04-29 22:24:37 +02:00
iceman1001
ffeb77fdc6
CHG: the 14b is getting better, since I added the fpga waiting signaling I found in "14a emgetcmd" etc.
2016-04-29 22:23:32 +02:00
iceman1001
57850d9dfb
CHG: FpgaSetupDMA, handle when it returns NULL.
2016-04-27 20:42:44 +02:00
iceman1001
d51717fffd
CHG: 'hf 14b sim' better work flow on device side. not done yet.
2016-04-27 20:42:01 +02:00
iceman1001
0923c43cc6
CHG: "hf 14b sim" making the flow to be similar to "hf 14a sim".
2016-04-27 19:53:21 +02:00
iceman1001
dccddaef77
CHG: "hf 14b sim" - Added the possibility to call it with a PUPI/UID. Sample: "hf 14b sim u 11223344"
2016-04-27 11:21:29 +02:00
iceman1001
8040711b90
REM: removed a debug function call, PrintToSendBuffer
2016-04-26 21:34:24 +02:00
iceman1001
a287e8cfdd
CHG: FpgaSetupDMA can fail and returns NULL. Added a check for it.
2016-04-26 21:31:43 +02:00
iceman1001
11c2df83d2
CHG: Much more stable 14B functionality when Sending as Reader/PCD and Reading from Tag/PICC. The read distance is up to 2.5cm and is not nearly so position picky as previous version. The logtrace now also logs times.. kind of.
...
Getting there slowly.
2016-04-26 21:29:45 +02:00
iceman1001
aa5bbe6a9b
CHG: changed this call, to the #define name instead.
2016-04-24 21:45:22 +02:00
iceman1001
cd777a0545
FIX: Some Coverity Scan warnings. fread, not initialised etc etc
2016-04-23 18:23:46 +02:00
iceman1001
5bb6228386
syntax suger
2016-04-23 13:04:22 +02:00
iceman1001
72e6d4621a
code clean up
2016-04-21 10:30:42 +02:00
iceman1001
bc9393715f
CHG: "hf 14a sim" command , correct use of FLAGS
...
CHG: "hf 14a sim" command, changed the data collection for the attackmode in SimulateIso14443aTag. It now uses @holiman 's original implementation. But we can't change "NR", so we do next.
CHG: "hf 14a sim" command, nonce is increase with every new auth. This is for the "mfkey32_moebius" attack to work.
CHG: "hf mf sim" command (function void Mifare1ksim ) now handles UID' with length 10.
CHG: "hf mf sim" command nonce is increase with every new auth. This is for the "mfkey32_moebius" attack to work.
2016-04-18 13:26:16 +02:00
iceman1001
c01d8e21ea
CHG: deviceside changes to deal with sniffing UID's with length of 10.
2016-04-18 13:19:11 +02:00
iceman1001
13fc2e9c71
ADD: added triplesided UID to "hf mf sniff"
2016-04-14 11:35:49 +02:00
iceman1001
c981c53ff3
MOV: moved the #DEFINES into protocols.h
2016-04-14 11:34:36 +02:00
iceman1001
68410a4892
Syntaxt suger
2016-04-14 11:34:02 +02:00
iceman1001
0194ce8fc8
ADD: simulating can now handle triplesized UID (10b)
...
CHG: moved some mifare #DEFINES into protocols.h (ACK,NACK..)
2016-04-14 11:09:17 +02:00
iceman1001
91c7a7ccb7
Syntaxt suger,
...
and some clean up in the "hf mf mifare" code. I removed the three strategies Pivi added to make the code easier and added a lot of comments to understand.
the WDT bug is still there in this code. Needs further testing yet, before I commit the fix.
So far the fix is quite stable on ubuntu, but on mingw/win is breaking still. Which at this point doesnt make any sense.
2016-04-12 11:36:52 +02:00
iceman1001
88e20c9f6d
syntax suger
2016-04-12 11:30:49 +02:00
iceman1001
46f983fe9e
REM: removed an unused method MifareCollectNonces
...
ADD: added some set_tracing(FALSE) calls for consistency.
and.. syntax suger
2016-04-12 11:29:40 +02:00
iceman1001
41863885d0
REM: removed some unused code, GetDeltaCountUS() and a global counter variable. Its not used anywere.
...
CHG: syntax suger
2016-04-11 15:26:15 +02:00
iceman1001
86d597a510
ADD: added @pivi 's faster authentication method from 'hardnested' into "hf mf chk" (check keys) and removed the "halt" command.
...
the speedup is great. Together with the previous speedups from making changes how the client sends the keys to the device, make it lightning fast. It would be fun to see how much fast it is now.
2016-04-11 15:25:00 +02:00
iceman1001
ca5bad3d73
CHG: syntax suger,
...
CHG: the nested call to readerreceive is not negated..
2016-04-10 13:05:01 +02:00
iceman1001
1b4a446aba
CHG: syntax suger..
2016-04-10 12:58:04 +02:00
iceman1001
2abdfa491c
CHG: mostly syntax suger, trying to uniform the look 'n feel.. To make calls act to what is expected.
2016-04-10 12:56:59 +02:00
iceman1001
5eceba292f
CHG: some textual change and some syntax suger changes.
2016-04-10 12:55:18 +02:00
iceman1001
cb832982c9
FIX: how to break a working thing by being blind...
2016-04-10 12:29:38 +02:00
iceman1001
06eb3b1a8c
coverity fixes for my latest changes.
...
Forgot some breaks in 7816 annotation, and presco used an uninitalized char array.
2016-03-22 08:40:20 +01:00
iceman1001
9206d3b034
ADD: copied all EMV files from peter filmoores fork. Have not started with making it work in current fork. (a lot of work)
2016-03-20 19:37:29 +01:00
iceman1001
6fc68747f6
ADD: well, starting with a luascript for reading calypso tags, made me remake the 14b raw command on client and device side. Sorry @marshmellow42 , but this one broke your "hf 14b info" implementation. I fixed the "hf 14b read" and the hf search. So not to bad, but still a bit broken. The 14b raw device side is now very similar to 14a raw. Which is good. There is a Standard 14b 0x050008 detection and STmicroelectronic 0x0600 detection on deviceside. This removes a lot of code client side.
...
I also made the SRi read functions better by combining them. The demodulation / uart code should be the same as last summers changes. The device side code can now be even smaller.
2016-03-20 19:33:07 +01:00
iceman1001
cef590d9ef
CHG: Added the BigBuf_Clear_ext calls, returned to Marshmellow42 's / pwpiwi 's sampledemod. The 14B commands works again...
...
CHG: re-arranged the Uart, Demod structes init, reset, in a first attempt to prepair to move them to a seperate file.
2016-03-13 07:20:21 +01:00
iceman1001
f2c2b174cd
CHG: moved some #define into include\common.h (which is call by apps.h), so we have one place for them. Also changed them to CAPITAL.
...
ABS(), MIN(), MAX()
2016-03-13 07:16:42 +01:00
iceman1001
1615d06a2e
CHG: breaking up a long line in armsrc/Makefile to make it easier for ppl to understand how to compile for different standalone modes..
2016-03-13 07:12:54 +01:00
iceman1001
aaa1a9a2dc
CHG: Added calling clear bigbuff to zero out it also, instead of just "free" it.
...
ADD: downloading the EML part from BigBuffer specially.
2016-03-12 09:03:28 +01:00
iceman1001
6c68b84a6e
@Marshmellow42 additions:
...
ADD: Q5 to 'LF PYRAMID'
ADD: ST sim addition to SIM ask.
REF: 29ada8fc08
2016-03-07 18:53:02 +01:00
iceman1001
38e4191705
CHG; a fix for "HF TUNE", I always were annoyed with the hf tune where it printed one value per row endlessly. So this fixes that, it uses "\r" to print on the same row. Works on MINGW/WINDOWS. Havn'nt tested it on Linux yet. But it looks good now.
2016-03-06 10:35:25 +01:00
iceman1001
0db11b71ef
ADD: Added the HitagS from @spenneb ref: https://events.ccc.de/congress/2015/Fahrplan/events/7166.html
...
PM3 Master PR: https://github.com/Proxmark/proxmark3/pull/167
Adjusted the ENUM names to fit in my fork. We need a better namestandard for it.
2016-03-04 19:06:47 +01:00
iceman1001
ff3e074478
CHG: some minor changes to the 14b, the read 14b lua,
2016-03-01 07:03:00 +01:00
iceman1001
c728b2b4cf
FIX: Added @marshmellow42 's fix for ASK/Biphase simulation on deviceside.
...
CHG: Added @marshmellow42 's refactoring of "gprox-II" demod.
2016-03-01 06:57:02 +01:00
iceman1001
69c4516d32
chg: minor changes to text, explaining current implementation for "lf pyramid clone/sim" only works for 26bits.
2016-02-27 12:12:05 +01:00
iceman1001
c0f15a05b3
ADD: Marshmellows fixes for "lf t55xx" and "lf cmdread" ref: https://github.com/Proxmark/proxmark3/pull/166/files
2016-02-21 17:44:25 +01:00
iceman1001
c7962313cc
FIX: an extra break inside "Hf mf cgetsc" made it not read the fourth block in the sector.
2016-02-20 00:29:35 +01:00
iceman1001
b03006794f
CHG: removing some time-debug statements.
...
CHG: increased the time-out message 2sec, in proxmark, to make "hf mf chk" work better.
CHG: still trying to solve the "hf mf mifare" WDT_HIT bug.
With these changes, the "hf mf chk" / "Hf mf nested" looks similar and should be a bit faster.
2016-02-19 22:34:39 +01:00
iceman1001
838c15a643
ADD: added some time debug statements to be able to measure execution time.
...
CHG: change the auth_ex method to send usb package faster,
REM: removed some bucketsort changes.
2016-02-17 17:30:37 +01:00
iceman1001
aacb96d7ed
FIX: Coverity scan fixes, hard to keep track of stringlengths while reading and copying in C.
2016-02-17 10:46:08 +01:00
iceman1001
82885445b3
FIX: cuid order...
2016-02-16 23:51:52 +01:00
iceman1001
7504dc50d5
Merge branch 'master' of https://github.com/iceman1001/proxmark3
...
Conflicts:
armsrc/crypto1.c
2016-02-16 21:43:45 +01:00
iceman1001
ee97a92adb
CHG: testing a prng_successor_one method
2016-02-16 21:41:10 +01:00
iceman1001
6a18e46fa6
FIX: finally I took the effort to finish the "hf mf c*" commands on device side...
2016-02-15 22:04:24 +01:00
iceman
a70fcfb655
add: added a noncedistance method
2016-02-15 02:46:48 +01:00
iceman
6e91de5a8d
add: added a test function for nonce distance
2016-02-15 02:46:15 +01:00
iceman1001
a11ca2f305
FIX: @wllm-rbnt 's typo fixes
2016-02-12 07:37:10 +01:00
iceman1001
4b78d6b317
CHG: having a go at finding the WDT death second time we run "hf mf mifare"...
2016-02-10 21:46:52 +01:00
iceman1001
5192a0a689
CHG: syntax suger
2016-02-10 21:45:03 +01:00
iceman1001
b7536e11e1
FIX: added @marshmellow42 's fixes for StandAloneMode. Some debug printed wrong sized hex and the call to CopyHIDtoT55x7 had the parameters in wrong order.
2016-02-10 17:33:12 +01:00
iceman1001
bd9dfaa891
CHG: Syntax suger
...
EXperimented: unfolded a loop.
2016-01-25 20:24:23 +01:00
iceman1001
4c0cf2d215
Experimeting with finding the "WDT_HIT" bug in "Hf mf mifare", which not shows if "hf mf dbg" is set to 3 or more...
2016-01-25 20:21:11 +01:00
iceman1001
5f5254d631
FIX: Possible usage of NULL.
2016-01-25 20:19:47 +01:00
iceman1001
65c2d21d05
CHG: Syntax suger
2016-01-25 20:19:15 +01:00
iceman1001
da198be4b5
CHG: Syntax suger
2016-01-25 20:17:08 +01:00
iceman1001
810f53792e
ADD: added the possibility to choose which block num to attack with "hf mf mifare" Before it only worked on block 0.
2016-01-20 22:26:01 +01:00
iceman1001
5ebcb867a3
FIX: Some uninitialized variables, some syntax suger, and some extra WDT_HIT calls inside "ReaderMifare" to stop it from trigger when running multiple times in a row.
2016-01-20 19:53:58 +01:00
iceman1001
d798d31cbe
FIX: Coverity scans, uninitialized variables,
...
CHG: unfolded some loops..
2016-01-20 17:44:51 +01:00
iceman1001
4a71da5a35
FIX: Coverity Scan complains about resourceleaks, array reads outside of index, uninitialized variables.
2016-01-20 17:13:25 +01:00
iceman1001
bf22fab73b
FIX: Coverity Scans complain about uninitialized usage of struct. Setting s->ODD and s->EVEN to zero should do the trick.
2016-01-20 11:31:24 +01:00
iceman1001
495d7f1326
FIX: Coverity scan, forgot one fread ...
...
CHG: Syntax suger
2016-01-19 22:25:34 +01:00
iceman1001
8130eba4d1
CHG: Syncronized so all different parts uses the same implementation of Crapto1 v3.3
2016-01-19 18:01:16 +01:00
iceman1001
7d5169a0e9
CHG: minor change initializing array.
2016-01-19 16:59:06 +01:00
iceman1001
02a405967e
CHG: The nonce from "hf mf nested" is fixed to this one, why is that one selected? Why not just all zeros or ones?
2016-01-19 16:32:29 +01:00
iceman1001
9974991e4b
CHG: Syntax suger
2016-01-19 16:31:38 +01:00
iceman1001
417f4ae127
CHG: Crapto1 v3.3 for the ARMSRC
2016-01-19 16:19:59 +01:00
iceman1001
c2d2a5a6b5
CHG: Tried to unfold some loops inside ARM/crypto1 imp. It can't hurt, feels stabil.
2016-01-13 22:24:12 +01:00
iceman1001
0d5ee8e245
ADD: @pwpiwi 's latest changes to 'hf mf hardnested'
2016-01-13 09:31:13 +01:00
iceman1001
5cc88edfaf
CHG: syntax suger
2016-01-09 17:19:09 +01:00
iceman1001
dd79e03a1a
ADD: a new pwdgen algo Nicknamed C, (Huge props to @Bettse for everything) also added to the "hf mfu info" command. However, that will not work given the system's lockbits.. :( Maybe I'll add a function to test all imp pwdgens given a UID without making a authentication call to tag.
...
ADD: BSWAP_32 macro, for changing endianness.
2016-01-09 17:17:36 +01:00
iceman1001
7f6ccd3926
FIX: coverty scan defects.
...
- bigbuf.c is comparision correct (iLen versus numofparity)
- cmdhfepa.c resourceleak, add a call to free
- cipherutils.c resourceleak, added calls to free
2016-01-08 15:28:24 +01:00
iceman1001
614da335f6
Syntax suger, making the code easier to read (for me at least)
2016-01-08 14:26:35 +01:00
iceman1001
ab7bb49475
FIX: coverty scan reveals some resourceleaks and overruns, which is supposed to be fixed now.
...
/armsrc/des.c overflow 7 instead of 6
/client/cmdlfhitag.c overflows traclen
/client/util.c sprint_bin_break overflows.
/client/cmdhficlass.c need to free memory after malloc.
ADD: RotateRight macro in util.h
2016-01-08 14:25:10 +01:00
iceman1001
09181a5462
code clean up, added some comments to hitag
2016-01-03 17:17:44 +01:00
iceman1001
c35145bf7a
FIX: the usb_poll_validate_length() check should be inversed, thanks @marshmellow42
2015-12-22 16:14:03 +01:00
iceman1001
9332b857ff
ADD: @marshmellow42 's fixes for Q5, t55xx, fskclock,
...
ADD: got tired of always writing wrong "hf 14a list", so I hooked it back up to call the "hf list" with argument. Things becomes smoother that way.
2015-12-16 11:01:46 +01:00
iceman1001
2b1f4228c2
ADD: @marshmellow42 's changes to "hf mfu *" ,
...
ADD: @marshmellow42 's changes to "hf mf sim",
ADD: @pwpiwi 's parity files was missing.
2015-12-15 09:34:55 +01:00
iceman1001
f8ada309e9
ADD: @pwpiwi 's latest code from his 'hardnested' branch.
2015-12-15 08:51:29 +01:00
iceman1001
508b37ba9c
REM: removed an unused doublett function "printBits" in util.c
...
ADD: added a new string helper function "sprint_hex_ascii" in util.c
ADD: added "LF AWID BRUTE", a very simple bruteforce command for the awid commands.
it takes a facility-code, and iterates all possible 0xFFFF cardnum by sending sim command. It also uses the usb_poll function to stop the bruteforce on keypress and not leaving the pm3 device running the simulation.
the command implements the help parameter.
2015-12-14 22:50:54 +01:00
iceman1001
8ce3e4b4e9
add: missing two hard_nested files..
2015-12-02 16:48:25 +01:00
iceman1001
3f26796673
FIX: the lfsampling.c for t55xx had a tendecy to enter a neverending loop. Moved exit branch into the while statement, which seems to solve it.
...
FIX: Strange int -> uint8_t casting behavior (0x05 gets the 25bit set and becomes 0x10005 instead) in fskdemod, removed int and sscanf.
2015-12-01 22:38:37 +01:00
iceman1001
c188b1b9b2
ADD: @go_tus simple bruteforce for t55xx, refactored a bit.
...
ADD: @pwpiwi 's implementation of Hardnested
2015-11-27 16:24:00 +01:00
iceman1001
1a570b0a6a
CHG: Missing some headers
...
FIX: some message/warning in pm3_binlib.c @gm4tr1x
2015-11-23 10:49:16 +01:00
iceman1001
e9a92fe237
FIX: the read counter in "hf 14a sim" (for ntag/ev) should work better now. Instead of always returning zero, it increases aswell.
...
--Started to add the TI demod into the 'LF SEARCH"
2015-11-22 21:48:15 +01:00
iceman1001
a126332a7b
ADD: @marshmellow's fixes to awid, viking and T55x7
...
ADD: 'lf t55xx detect' now can be called with a password.
ADD: trying to add the read counter and increase counter commands for ntag sim.
2015-11-22 17:33:41 +01:00
iceman1001
6426f6ba86
@marshmellows last LF changes.
...
- wipe a t55x7 tag
- stable demods
-
2015-11-20 16:56:43 +01:00
iceman1001
0956e0dba5
FIX: an error that I introduced to the csetblock command with wrong length of crc calcs.
...
CHG: variable name in csetblock change. just trying to be consistant.
ADD: code clean up in hf 14a, added some help text methods.
2015-11-10 11:45:45 +01:00
iceman1001
70459879e9
added @marshmellows new viking demod.
...
adjusted it to fit with the clone/demod that is under "lf viking" commands.
did some code clean up, 3spaces into tab.
2015-11-10 11:42:59 +01:00
iceman1001
edaf10af99
CHG: minor code clean up, removed commented old code.
...
ADD: usb_poll_validate_length to some deviceside loops.
ADD: @marshmellow42 's fixes to LF
2015-11-09 21:51:34 +01:00
iceman1001
7c5f2ced5b
ADD: @piwi's fixes to "hf snoop" where it empties the bigbuffer before snooping.
2015-11-09 21:48:09 +01:00
iceman1001
c2731f37be
CHG: a major remake of the "hf mf c*" commands. Ie chinese magic tags. Tried to make them consistent in parameter calls and simplified. And fixed the annoying gen1 tags that answers with a ACK/NACK on HALT commands..
2015-11-09 21:46:15 +01:00
iceman1001
94422fa23f
ADD: @marshmellow42 's fixex and resetread t55x7
2015-11-02 20:46:17 +01:00
iceman1001
acd7ccdbc9
CHG: some magic generation1 tags is not following protocol and answers to the "halt" command. This gives an error and makes the users think something went wrong. This also affected the magic identification in "Hf 14a reader" command, where it in those moments stated "NO" even if the tag is indeed a generation1.
2015-11-01 22:16:16 +01:00
iceman1001
afa86e5c03
ADD: help text for 'hf snoop' / 'hf search' / 'hf list'
...
CHG: minor code changes.
CHG: makefile , moved hi_sniffer.v from LF into HF row. @piwi suggestion for PR https://github.com/Proxmark/proxmark3/pull/141
2015-11-01 19:49:08 +01:00
iceman1001
857bc2ff6a
CHG: some desfire changes from @bforbort fork. *untested*
2015-10-30 09:09:35 +01:00
iceman1001
1d0ccbe04b
ADD: added the "hf snoop" patch original from @Enio, rearranged by @Etmatrix.
...
ADD: added the "t55x7" refactoring by @marshmellow42
2015-10-27 21:47:21 +01:00
iceman1001
1c8fbeb93e
ADD: 'LF T55X7 WAKEUP' command. For tags with AOR bit set, send this command with password to wake tag up and be able to do a "LF SEARCH" etc on it.
...
CHG: Minor code changes on T55X7 code. Default password is back to 'FF FF FF FF',
REM: removed @marshmellow42 's wakeup option in "lf t55x7 read",
--- BASICALLY:
if a T55X7 tag has following bits set:
AOR - send wakeup command with pwd, to enable LF interacting with it.
PWD - send read/write/trace/info command with pwd. No need to send wakeup.
2015-10-21 09:12:33 +02:00
iceman1001
2efd639484
CHG: some cleanup of pcf7931.c
2015-10-20 19:02:03 +02:00
iceman1001
9276e859a6
ADD: @marshmellows42 's fixes for "lf cmdread" and CHANGELOG.md
...
ADD: Added the "lf t55x7 wakeup" command. It will send a pwd, and leave the antenna on.
Process like:
1. lf t55x7 wakeup p 11223344
2. lf search
---
It is still not finished, will work together with the "lf t55x7 commands" in next step when I figure out the process from the datasheets.
2015-10-20 19:00:02 +02:00
iceman1001
a739812e89
FIX: thanks @tony, for pointing out a "end" statement inside tnp3sim.lua
...
ADD: @marshmello42 fixs for t55x7
2015-10-16 23:16:46 +02:00
iceman1001
6a09bea427
CHG: code clean up. Have some questions regarding the CopyVikingTo method. The configblock looks wrong..
2015-10-15 11:30:37 +02:00
iceman1001
e16054a468
CHG: minor updates in the T55x7 methods. added the LED_A_ON / LED_A_OFF to indicate when a T55x7 command is running.
...
CHG: added some more comments to T55x7, next person who looks at this will have it easier.
2015-10-15 11:00:07 +02:00
iceman1001
ac2df3460a
ADD: @marshmellows fixes for t55x7 reading signal.
...
ADD: @marshmellows "diphase" definition for T55x7.
MOV: extracted the aquisition from the t55x7 methods and put them inside lfsampling.c
FIX: pcf7931 write, there is 16bytes in a block.. not 4 as I thought before.
FIX: t55x7 lowered the WRITE_0 to 16. Even bigger gap.
2015-10-15 10:23:15 +02:00
iceman1001
368044201a
FIX: The T55x7ReadBlock method, should not have the startgap since it indicats that it might be a write command. See if this fixes the bug.
...
ADD: Extracted the whole pcf7931 functionality into seperat files. The lfops.c is starting to become too large.
2015-10-14 11:39:51 +02:00
iceman1001
2285d9dd94
FIX: I did a clean up of the "LF PCF7931" code. The write command is not quite done.
...
FIX: Added some more "clearCommandBuffer" calls before sending..
2015-10-12 21:30:54 +02:00
iceman1001
5ee53a0e75
ADD: There were lot of calls to enable tracing, but very few to turn it of afterwards in the methods.
...
Don't know if it has some influence but can't hurt calling "set_tracing(FALSE);" when method returns.
2015-10-11 19:14:17 +02:00
iceman1001
3bc7b13d23
ADD: @marshmellow42's decrypt crypto-1 method,
...
ADD: @piwi's latest commit to PM3 Master, aiming at the WDR in "hf mf mifare".
2015-10-11 09:07:29 +02:00
iceman1001
e98572a1e2
I just merged @marshmellow's branch "iclass" and that was a lot of new functionality. *great work*
...
Things like the ICLASS, tryDecryptWord,
--
My other stuff like default keys, some new Mifare EV1 commands 0x40, 0x43 for the logging annotation, start of the T55x7 configblock helper functionality (ripped from Adam Lauries RFIdler code)
Changes to the PCF7931 functions written, which has a lousy input check..
2015-10-07 23:00:46 +02:00
iceman1001
0de8e3874d
A lot of changes...
...
.. ntag simulation stuff from @marshmellows branch "ntag/sim"
.. hf mf mifare fixes from @pwpivi.
.. hw status command
.. speedtest function from @pwpivi
.. Viking Functionalities, (not a proper DEMOD, but a start)
.. GetCountUS better precision from @pwpivi
.. bin2hex, hex2bin from @holiman
...
starting with getting the T55x7 CONFIGURATION_BLOCK for different clone situations. Ripped from Adam Lauries RFidler, nothing working or finished..
...
Started working with the T55x7 read command with password actually performs a write block... See Issue #136 https://github.com/Proxmark/proxmark3/issues/136 Not solved yet.
...
Started add SHA256.. not working yet..
2015-10-04 18:01:33 +02:00
iceman1001
f62b5e1204
added @piwi 's usb speed test.
...
.. found out that my usb speed is really slow. Started to look for reasons. Have a win7 64 env, running on a vmware image.
2015-07-31 10:37:24 +02:00
iceman1001
0db6ed9a71
Merge some PM3 master commits. Had to re-make the StandAloneMode to work with flags in SimulateIso14443aTag
2015-07-29 01:10:06 +02:00
iceman1001
5de79e20f1
MOD:: reverse back changes to 14443b.c
...
ADD: the hid-flasher/usb_cmd.h wasn't up to date with how it's other file /common/usb_cmd.h looks like.
ADD: utils.lua 14443v crc inside LUA.
ADD: utils.lua ConvertAsciiToHex method and minor adjustments checks.
2015-07-28 21:33:09 +02:00
iceman1001
6427695bb4
ADD: using @holiman's "ubs_poll_validate_length() function in some device-side functions.
...
-hitag2, -legicrf, HIDdemodFSK, CmDAWIDdemodFSK, CmdEM410xdemod, CmdIOdemodFSK
It should enable them to be aborted with a call to "hw ping / hw status" instead of only button-press. Which is good when you are scripting stuff.
2015-07-22 23:45:41 +02:00
iceman1001
11fe3a8975
REM: Removed a debugstatment
2015-07-22 23:36:28 +02:00
iceman1001
7838f4beba
MERGED: @holimans changes
...
MERGED: @piwi changes
MERGED: @marshmellows changes.
I'm not even gonna try write up all that stuff..
ADD: changed some commands inside the "Hf 14a sim" on deviceside.
ADD: @mobeius "two nonce" version for mfkey32. It is also inside the "hf 14a sim" with the "x" parameter.
2015-07-22 23:00:52 +02:00
iceman1001
f445df401e
ADD: started with adding a "LS" command that lists the commands without the help text printed. To give easy clean list.
2015-07-22 11:19:15 +02:00
iceman1001
5b59bf20c7
FIX: "hf list 7816", the s-blocks is now also printed.
...
FIX: iso14443b.c got some minor adjustments in the demod and codeas14443btag. Seems it works better for me.
I still have the problem with powerup of a 14b tag. I need to run the "14b raw -c -p 05 00 08" a couple of times before I get an answer.
2015-07-19 23:24:19 +02:00
iceman1001
db25599d7f
ADD: @holiman's clearCommandBuffer in cmdlft55xx.c
...
ADD: @VERTCraig's AVID commands.
TEST: testing some changes to iso14443 demod.
2015-07-18 20:43:14 +02:00
iceman1001
d8af608f8e
TEST: Moebius two noce mfkey32...
2015-07-13 23:06:49 +02:00
iceman1001
a62bf3afe1
@frederikmoellers EPA changes, with APDU for ISO14443b support
2015-07-13 00:04:16 +02:00
iceman1001
b10a759fef
@PM3 master merges, Piwi fix for mfnested
...
@Marshmellow42 's fix for FDB
2015-07-12 22:58:16 +02:00
iceman1001
99cf19d9e8
ADD: @pwpivi 's latest fixes for bigbuff
...
ADD: @marshmellow 14b changes.
fix: fixes to the timing inside iso14443b.c sniff/sending. Between TX & RX there should be a 151us pause.
2015-06-29 22:36:55 +02:00
iceman1001
c830303d7e
FIX: @pwpiwi 's fixes for darkside / nested attack about the NACK/PRNG bugs.
2015-06-25 12:41:39 +02:00
iceman1001
5ce7e22af6
ADD: forgot the zlib and some new fpga compress file.s
2015-06-25 12:29:41 +02:00
iceman1001
17ad0e0948
ADD: @marshmellow42 's 14b fixes.
...
FIX: 14b sim changes in iso14443b.c , *experimental* I took some timing loops from "14a sim" armsrc/iso14443a.c and merged it into the "14b sim". Now using two pm3's I can have one simulating and the other reading and it works. Ask @pwpiwi if you want to know more of what those timing loops does. Something about waiting for the fpga delay queue...
2015-06-25 12:25:44 +02:00
iceman1001
9783989b40
ADD: pwpiwi 's FPGA compress
2015-06-25 12:22:34 +02:00
iceman1001
f53020e729
Merge branch 'master' of https://github.com/Proxmark/proxmark3
...
Conflicts:
armsrc/Makefile
armsrc/iso14443b.c
armsrc/lfops.c
client/cmdhf14b.c
client/cmdhfmfu.c
fpga/fpga_hf.bit
fpga/hi_read_rx_xcorr.v
2015-06-23 23:02:29 +02:00
iceman1001
d0f3338e0c
ADD: PACE functionality ref: https://github.com/Proxmark/proxmark3/pull/121
...
FIX: some missing usb_commands for EPA.
2015-06-23 22:30:18 +02:00
Martin Holst Swende
1e1de234ac
Merge pull request #121 from frederikmoellers/master
...
Add PACE replay functionality
2015-06-23 22:23:08 +02:00
Martin Holst Swende
b8d34d0598
Merge pull request #118 from marshmellow42/master
...
fix t55xx write timing
2015-06-23 22:18:50 +02:00
pwpiwi
01b7a6a898
Merge pull request #114 from pwpiwi/iso14443b_fix
...
fixing iso14443b (issue #103 ): fix bug introduced during Bigbuf rework
2015-06-23 07:14:52 +02:00
pwpiwi
705bfa1058
fixing iso14443b (issue #103 ):
...
- increased DMA_BUFFER_SIZE to avoid occasional circular buffer overflows.
- minor code cleanups
2015-06-22 22:03:43 +02:00
Frederik Möllers
3bb07d96c8
Add PACE replay functionality
...
This function allows the user to specify APDUs which are sent to a card
supporting the PACE protocol. The response times are measured and
printed.
The code was pulled from the old Google Code repository (branch "epa")
and modified to fit into the new code base.
2015-06-22 14:20:13 +02:00
iceman1001
ce3d6bd25a
FIX: fastread dont do multiplication by zero, thanks @marshmellow42
...
ADD: "hf 14a sim t 7" now implements a simple incr_counter command. it sends ACK to all requests.
ADD: "hf 14a sim t 7" now prints the password when a "0x1B" (Authenticate) command is received.
2015-06-22 09:49:12 +02:00
iceman1001
5e42846302
CHG: "hf 14 sim t 7" ie NTAG simulation, now reads the emulator memory for read commands. this means you need to load the emulatormemory before... if you want it answer more correct..
2015-06-21 21:57:52 +02:00
iceman1001
36f84d4748
ADD: @pwpivi latest fixes.
...
ADD: @marshmellows fixes.
2015-06-21 21:56:44 +02:00
pwpiwi
467340996e
fixing iso14443b (issue #103 ):
...
- fix hf 14b snoop
- fix hf 14b sim
2015-06-21 18:04:24 +02:00
iceman1001
c9216a92aa
FIX: "hf 14a sim" fixes to CRC calc.
...
ADD: added CHECK_TEARING command support in "hf 14a sim" (EV1/NTAG216 command)
BUGS: the read range probably will could currupt memory..ref:: http://www.proxmark.org/forum/viewtopic.php?pid=16611#p16611
2015-06-21 11:09:54 +02:00
iceman1001
22e2470051
ADD: @marshmellow42 fudan detection in hf mfu
...
ADD: @marshmellow42 14b reader changes.
ADD: @pwpiwi 14b fixes
2015-06-21 11:07:05 +02:00
pwpiwi
da586b1702
fixing iso14443b (issue #103 ):
...
- revert removal of FPGA_HF_READER_RX_XCORR_848_KHZ. Need to be able to switch to 424kHz for ISO15693.
2015-06-18 15:41:30 +02:00
iceman1001
569009f3f7
ADD: @pwpiwi 's fix 50365fedcb
2015-06-18 13:51:00 +02:00
pwpiwi
50365fedcb
fix issue #116 : remove includes of stdio.h in armsrc
2015-06-18 11:33:53 +02:00
iceman1001
abb215301c
add: @pwpipi 's fixes to 14B
2015-06-18 09:52:53 +02:00
pwpiwi
132a02179c
fixing iso 14443b (issue #103 ):
...
- fix: treat empty commands as error
- deleting dead code
- rename USB-Commands (ISO14443 -> iso14443B)
2015-06-18 09:49:22 +02:00
pwpiwi
d5875804a3
fixing iso14443b (issue #103 ):
...
fix: don't waste time to calculate parity bits. Instead add void parity bits to trace and ignore them on client side
2015-06-18 07:56:08 +02:00
pwpiwi
51d4f6f114
fixing iso14443b (issue #103 ):
...
- fix: IQ demodulator (FPGA)
- fix: approximately align reader signal delay to tag response delay (FPGA)
- fix: remove deprecated RSSI calculation to improve decoder speed (iso14443b.c)
- fix: better approximation of signal amplitude to avoid false carrier detection (iso14443b.c)
- fix: remove initial power off in iso14443b raw command (iso14443b.c)
- add: enable tracing for iso14443b raw command (iso14443b.c)
- fix: client crashed when checking CRC for incomplete responses (iso14433b.c)
- speeding up snoop to avoid circular buffer overflow
- added some comments for better documentation
- rename functions (iso14443 -> iso14443b)
- remove unused code in hi_read_rx_xcorr.v
2015-06-17 20:27:36 +02:00
iceman1001
d71d59dbd1
ADD: @marshmellow42 's 14b changes.
2015-06-15 20:59:01 +02:00
iceman1001
839a53ae4c
ADD: added support for commands. READ_SIGNATURE 0x3C, READ_COUNTER 0x39 for NTAGs in "hf 14a sim"
...
the ECC signature is taken from a NTAG 215 tag. Might work.
Counters always returns 0, :)
2015-06-15 14:01:34 +02:00
iceman1001
32719adfa1
ADD: added support for some NTAG/EV1 commands to "hf 14a sim" on device side.
...
0x1B (authenticate)
0x3a (fast read)
0x60 (get_version)
This is used in a new mode on client, "hf 14a sim t 7"
2015-06-14 22:40:18 +02:00
iceman1001
550a929a69
FIX: Reverting the t55x7 timings. (@marshmellow42 's fix)
2015-06-13 12:13:21 +02:00
marshmellow42
4a3f1a3793
revert t55xx start gap and write timing changes
...
also noted specs in comments
2015-06-11 23:52:40 -04:00
iceman1001
47286d89e4
ADD @pwpiwi 's fixes for "HF 14B" commands.
2015-06-03 21:12:55 +02:00
pwpiwi
09c66f1f09
fixing iso14443b (issue #103 ): fix timing issue (speeding up
...
the decoders)
2015-06-03 13:28:28 +02:00
pwpiwi
5b95953d42
fixing iso14443b (issue #103 ):
...
- most significant bit of tag data (which happens to be the sign bit)
had been dropped when snooping (FPGA change)
- avoid trying to decode both tag and reader data when snooping (we don't
have the time to do so).
2015-06-02 22:50:16 +02:00
iceman1001
77533e21ae
DEL: removed old iso14443.c since @pwpiwi renamed it..
2015-06-02 12:23:06 +02:00
iceman1001
489ef36cf6
ADD: @pwpiwi 's fixes for 14b. Including a rename from iso14443.c -> iso14443b.c
2015-06-02 12:17:34 +02:00
pwpiwi
67ac4bf75c
fix issue #103 : revert type change. Samples from FPGA are signed.
...
Renamed iso14443.c to iso14443b.c
2015-06-02 07:28:47 +02:00
pwpiwi
0d9a86c724
Fix issue #103 (hopefully). Quite an old bug which was previously
...
masked by a big DMA_BUFFER_SIZE.
2015-06-01 19:47:21 +02:00
iceman1001
2d2f7d1948
ADD: @marshmellow42 's changes / fixes.
2015-05-31 21:47:33 +02:00
iceman1001
95aeb706d7
CHG: @marshmellow42 changes on deviceside.
...
ADD: increase debuglevel for printing a statment in ul_ev1_auth
2015-05-27 23:23:46 +02:00
marshmellow42
e35031d2b7
MFU code cleanup - final ?
...
fixed bug in debug print in MF 1k sim.
2015-05-27 17:21:42 -04: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
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
iceman1001
c3c241f389
CHG: moved a xor function into util.c
...
CHG: added some calls to clearCommandBuffer() in /hf mfu/hf 14a sim/hf mf sim/ commands.
CHG: minor adjustments to relative pathing.
2015-05-26 11:04:57 +02:00
iceman1001
c068ebb78f
Merge branch 'master' of https://github.com/Proxmark/proxmark3
...
Conflicts:
armsrc/mifarecmd.c
client/cmdhfmf.c
2015-05-25 13:13:06 +02:00
iceman1001
46cd801c5a
FIX: dumptoemul.lua removed the extra linebreak in the end, making some load commands complain.
...
MOV: moved the try32/try64 attacks (mfkey32/mfkey64) into the nonce2key.c file
CHG: added @marshmellow42 changes to hf mfu dump layout.
ADD: an extra call to BigBuf_free in readcard.. just to make sure that it doesn't leak memory.
ADD: expermimental call to "try32" for "hf mf sim x".
2015-05-25 13:10:55 +02: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
iceman1001
7444d916c6
FIX: hf mfu dump, now reads correct memory from device-side.
...
CHG: hf mfu dump - output data styled :)
2015-05-24 21:51:44 +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
iceman1001
ce432659f2
Adjustments after the big merge from PM3 master.
2015-05-23 08:38:46 +02:00
iceman1001
bcf61bd34a
Merge branch 'master' of https://github.com/Proxmark/proxmark3
...
Conflicts:
README.txt
armsrc/appmain.c
armsrc/apps.h
armsrc/des.c
armsrc/iclass.c
armsrc/mifarecmd.c
armsrc/mifareutil.c
armsrc/mifareutil.h
client/cmddata.c
client/cmdhf.c
client/cmdhf14a.c
client/cmdhficlass.c
client/cmdhfmfu.c
client/cmdhfmfu.h
client/cmdscript.c
client/lualibs/commands.lua
client/lualibs/html_dumplib.lua
client/scripting.c
client/util.c
common/protocols.h
include/usb_cmd.h
2015-05-23 08:16:40 +02:00
iceman1001
fff69a1e34
CHG: Merged the "hf mfu rdbl" and "hf mfu crdbl" commands into "hf mfu rdbl". One read command.
...
CHG: Merged the "hf mfu wrbl" and "hf mfu cwrbl" commands into "hf mfu wrbl". One write command.
Both new commands implement a help, authentication (0x1A/0x1B) for ULC and the rest,
2015-05-20 23:44:11 +02:00
iceman1001
0a0d9a5828
@Marshmellow42 's fixes for bigbuf.
2015-05-19 18:46:38 +02:00
marshmellow42
d7acc6403e
hf mfu dump - bigbuf allocation fix
...
some larger nfc tags can get large so set the allocation to the 4k
CARD_MEMORY_SIZE buffersize.
2015-05-19 11:30:50 -04:00
iceman1001
d26849d4ae
CHG: the device-side code for "hf 14a sim x"
...
BUG: bcc1 xored error fix in "hf mf sim"
CHG: function rename Snoop -> Sniff.
2015-05-19 08:56:53 +02:00
marshmellow42
29250969b0
@iceman1001 s comments/updates mfu cmds
2015-05-18 22:07:11 -04:00
iceman1001
e7e9508883
@Marshmellow42 's cleanup isn device-side "hf mfu" code. Looks nice. Dump uses bigbuffer now, and can dump NTAG216 :)
...
Consistency on the client-side code "hf mfu". looks nice.
2015-05-18 20:58:33 +02: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
iceman1001
4d2e4eea58
CHG: the "HF MFU" authentication changes.
...
CHG: name change from "hf 14a snoop" -> "hf 14a sniff"..
2015-05-16 15:34:01 +02: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
2b3af97df2
various bug fixes
2015-05-13 11:07:47 -04:00
iceman1001
664bb5ae72
BUGS: more Coverity scan fixes.
2015-05-13 14:08:59 +02:00
iceman1001
8949bb5dad
Added @marshmellow42 "hf search"
2015-05-13 09:13:42 +02:00
marshmellow42
6ce0e5386a
HF Search - refactoring cmds to work with it
2015-05-12 16:45:48 -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
iceman1001
cd07302754
CHG: reverted a method declaration.
2015-05-05 00:35:56 +02:00
iceman1001
74daee24b8
CHG: for the 2k3des changes
2015-05-05 00:34:20 +02:00
iceman1001
8d53ea1403
CHG: added 2k3des to ULC READCARD.
2015-05-05 00:33:07 +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
iceman1001
062b7cb956
FIX: the HF MFU CREAD command on deviceside now can do a proper ATUTHENTICATION request with 2KEY3DES.
2015-05-01 15:29:19 +02:00
marshmellow42
92690507ab
Iceman's updates to MFU info and dump
2015-04-30 09:28:43 -04:00
iceman1001
1ec21089b2
CHG: the work in progress of making "HF MFU INFO" / "HF MFU DUMP" goes on.
...
ook @marshmellows changes and remade them a bit. TagTypeUL_t behaves like a flag-enum.
"HF MFU DUMP" now autodetects tagtype, and the deviceside should report back proper length.
2015-04-30 10:15:52 +02: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
iceman1001
c8ba098a9b
REM: Removed the CSETUID stub. Its implemented on the client side instead.
2015-04-28 23:34:16 +02:00
marshmellow42
e9b8d0dd6e
Iceman's mf sim 7bt UID fix from #97
2015-04-28 15:43:58 -04:00
iceman1001
76984409b9
FIX: forgot an argument.
2015-04-26 18:06:36 +02:00
iceman1001
fb2d24882e
Merge branch 'master' of https://github.com/Proxmark/proxmark3
...
Conflicts:
client/cmddata.c
client/cmddata.h
client/cmdhfmf.c
client/cmdlf.c
client/cmdlfem4x.h
client/cmdlft55xx.c
client/lualibs/default_toys.lua
client/scripts/tnp3clone.lua
client/scripts/tnp3dump.lua
client/scripts/tnp3sim.lua
2015-04-24 19:04:01 +02:00
iceman1001
add0504dea
ADD: Started a "collect nonces" concept to be able to analyse the tag generated nonces.
2015-04-24 18:41:49 +02:00
iceman1001
5eae566a28
Merge branch 'master' of https://github.com/Proxmark/proxmark3
2015-04-08 21:24:08 +02:00
marshmellow42
25d3e5cc83
Merge remote-tracking branch 'upstream/master'
2015-04-08 14:19:19 -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
iceman1001
49dc1d0a9e
Merge branch 'master' of https://github.com/Proxmark/proxmark3
...
Conflicts:
armsrc/Makefile
armsrc/lfops.c
client/cmdlft55xx.c
common/ldscript.common
common/lfdemod.c
2015-04-01 18:02:10 +02:00
iceman1001
b8f705e73e
ADD: added some changes from Marshmellow
...
CHG: minor change to the help text for "LF HITAG WRITE"
2015-04-01 17:58:35 +02:00
iceman1001
e204bb7fb2
CHG: revert -O2 -> -Os compile
2015-04-01 17:52:24 +02:00
pwpiwi
f83c41c75b
Merge pull request #89 from pwpiwi/image_shrink
...
Reclaim more than 19K of ARM flash memory.
2015-03-31 22:57:33 +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
pwpiwi
e335ca2846
Reclaim more than 19K of ARM flash memory.
...
- added compiler options -fdata-sections and -ffunction-sections (thanks to iceman for the hint)
- removed float operations from common/lfdemod.c to avoid adding float libraries to the ARM os image
- moved the fpga images to the data section to avoid reserving unused space for a separate section
2015-03-31 08:07:26 +02:00
iceman1001
02d352fea7
Merge branch 'master' of https://github.com/Proxmark/proxmark3
...
Conflicts:
armsrc/iclass.c
armsrc/lfops.c
client/cmdlf.c
common/lfdemod.c
include/usb_cmd.h
2015-03-30 21:11:37 +02:00
iceman1001
46c65fed6c
CHG: adding some variable initalisation to the Uart.
2015-03-30 16:29:30 +02:00
iceman1001
aa60d1560e
NEW: HF MFU SETPWD - set password to a Ultralight C tag.
...
NEW: HF MFU SETUID - set UID to a magic UL / UL-C tag. *not implemented*
CHG: minor alignment for "Hf list" output.
CHG: removed unneeded function parameters to the ultralight commands
CHG: the const MAX_MIFARE_FRAME_SIZE is changed to MAX_FRAME_SIZE in the ultralight commands since the UL-Ev1 can have bigger frames than 18bytes.
CHG: adding DES support for the Ultralight-c read commands on deviceside.
2015-03-30 16:24:03 +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
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
marshmellow42
e0165dcf3a
Fixed indents to Tabs from Spaces
...
Spacing changes ONLY - no code changes
2015-03-25 14:24:36 -04:00
marshmellow42
327a690813
EM410x bug fix
2015-03-24 23:05:46 -04:00
iceman1001
0ec548dc21
Merge branch 'master' of https://github.com/Proxmark/proxmark3
...
Conflicts:
armsrc/lfops.c
client/cmddata.c
client/cmdlf.c
client/cmdlft55xx.c
client/cmdlft55xx.h
client/scripts/test_t55x7_bi.lua
2015-03-24 11:45:31 +01: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
iceman1001
754a35e72b
ADD: added the ioprox checksum test to IOdemodFSK
...
MENTIONED HERE: http://www.proxmark.org/forum/viewtopic.php?id=364&p=6
ADD: changed the layout of the HID descramble patterns a bit, and rearranged some hex/dec outputs.
2015-03-23 17:11:45 +01: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
iceman1001
b1db38e1b7
ADD: piwi's compiler flags -O2
2015-03-18 20:29:58 +01:00
iceman1001
78e875807f
FIX: narrowed down the detect modulation even further.
...
FIX: minor adjustment to t55xx inside of lfops.c when waiting for the antenna to settle.
FIX: added the possiblity to use graphbuffer fpr LF T55XX DETECT/TRACE/INFO .
MISSING:
the detect, trace, info, doesn't use a password for those tags with enabled password-mode.
2015-03-16 22:45:06 +01:00
iceman1001
05446d5bc3
Merge branch 'master' of https://github.com/Proxmark/proxmark3
...
Conflicts:
armsrc/lfops.c
client/cmddata.c
common/crc.c
common/crc.h
common/lfdemod.c
include/crc.h
include/crc.h.old
2015-03-16 13:13:18 +01:00
marshmellow42
b41534d142
adjust ask/biphase handling - more complete
...
also added XL EM410x formats
2015-03-15 22:03:50 -04:00
iceman1001
f2d46122d3
Merge branch 'master' of https://github.com/Proxmark/proxmark3
2015-03-12 19:01:09 +01:00
Martin Holst Swende
f7048dc8a9
Implemented usb_poll() within LF sim. This means the LF sim will be aborted whenever something comes over the USB
2015-03-12 16:32:01 +01:00
iceman1001
5ff3c4017b
add: a experimental lualib, unstable.
...
fix: Introduced a wrong variable name due to "cut & paste" before, now fixed.
2015-03-12 09:50:22 +01:00
iceman1001
96f39a47a9
Merge branch 'master' of https://github.com/Proxmark/proxmark3
2015-03-11 22:21:01 +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
iceman1001
12d708fec1
Merge branch 'master' of https://github.com/Proxmark/proxmark3
...
Conflicts:
client/cmddata.c
client/cmddata.h
2015-03-10 09:18:35 +01:00
marshmellow42
ada339a10f
biphase bug fixes
2015-03-09 15:27:20 -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
iceman1001
3ac59c7fed
Merge branch 'master' of https://github.com/Proxmark/proxmark3
...
Conflicts:
armsrc/crapto1.c
armsrc/iclass.c
client/nonce2key/crapto1.c
2015-03-06 09:02:15 +01: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
c8387e85e3
iClass full simulation of tags now officially works, with some cheating regarding reader update and write commands
2015-03-02 21:30:22 +01: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
Martin Holst Swende
e5cd4ee4b4
Tag MAC finally works! (Full sim not yet, though)
2015-03-02 20:14:35 +01:00
Martin Holst Swende
61fe90736b
Implemented the correct way to calculate MAC from a tag, feeding it an extra 32 zeroes. Also divided it up into two parts, one of which can be precalculated by the device before the simulation begins
2015-03-02 00:38:36 +01:00
marshmellow42
73da818743
lf simulation tests
...
added SimulateTagLowFrequencyTest function
with some adjustments that help ASK simulations
FSK and PSK still need help. Left original HID sim alone as for some it
may partially work.
2015-02-28 14:33:05 -05:00
Martin Holst Swende
c99dc845b1
Added the ciphers also.. doh
2015-02-27 20:19:10 +01:00
Martin Holst Swende
10a8875c72
Implemented new optimized version of MAC-calculation for iclass
2015-02-26 20:35:35 +01:00
marshmellow42
872e3d4d6f
NEW lf simpsk
2015-02-21 21:36:02 -05:00
Martin Holst Swende
b19caaefc2
Fixed minor bugs in iclass fullsim, does not work yet though
2015-02-21 20:47:40 +01: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