Commit graph

571 commits

Author SHA1 Message Date
iceman1001
34be8b4d37 CHG: wrong iso7816 (@piwi) 2019-01-29 15:23:07 +01:00
iceman1001
adffe29855 chg: adjusting license accoring match its .c file 2019-01-14 12:06:05 +01:00
merlokk
170cf7c67a inc timeout of card's response 2019-01-10 17:06:59 +02:00
iceman1001
2d5d8c130d chg: 'hf list 14a' - another 7bit command 0x35 2019-01-08 02:22:41 +01:00
iceman1001
806e5909a7 ADD: 'hf felica list' - updated annotation. 2019-01-06 19:41:29 +01:00
iceman1001
d4b32f3050 ADD: Sim module firmware upgrade file. v3.10 2018-12-19 23:28:01 +01:00
merlokk
85729d55e7 added arm side 2018-12-17 23:48:30 +02:00
iceman1001
c948911f71 chg... 2018-11-29 23:37:05 +01:00
iceman1001
2accb7d3f4 CHG: remove different clocks calls. 2018-11-29 23:32:59 +01:00
iceman1001
0b5ee43392 FIX: remove linker directive warnings used with compiler in CLANG, OS X. 2018-11-29 17:59:46 +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
e4cb74fedb chg: i2c comms, first try to recover i2c hangs. 2018-11-14 15:07:04 +01:00
merlokk
65923701f3 delete old files 2018-11-14 11:44:33 +02:00
merlokk
7214c70720 fido commands hash checks works. 2018-11-13 19:02:02 +02:00
merlokk
6ab12db7a0 mbedtls added 2018-11-07 18:05:02 +02:00
Chris
c75c0e4e52 chg: cleaning up in lfdemod.c, currently the ASK clock, demod of strong and weak signals 2018-11-07 12:21:57 +01:00
Chris
b9676e6c93 chg: use signal mean instead of hardcoded FSK_PSK_THRESHOLD
chg: stricter clock identification
chg: askclock detection, trying to find a better starting point
2018-11-02 18:38:06 +01:00
indigowor2
f29c94954f merge 2018-10-31 17:39:32 +00:00
merlokk
8bb192fc75 added some crypto 2018-10-26 14:12:20 +03:00
merlokk
61ea3109c9 start merge 2018-10-24 18:18:05 +03:00
Chris
97c0729289 fix: 'sc raw t' - tlv decoding work again
chg: 'sc brute' - now decodes TLV by default the found SFI
chg: 'sc raw' - better detection on armside when failing
2018-09-25 02:54:51 +02: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
d42b4f6ddf CHG: ask clean wave - better start position in signal 2018-09-09 23:02:41 +02:00
Chris
c187774a98 fix: hilow fuzzing overlap 2018-09-09 22:08:32 +02:00
Chris
bc0ffa9e51 fix: remove zeromean
chg: cleanup
2018-09-09 19:54:22 +02:00
Chris
d774e4c84f Chg: step2 in the signed vis unsigned graphbuffer signal processing.
It will break some tone-based demods like ti etc.
2018-09-09 12:34:43 +02:00
Chris
4e42d11d15 FIX: HI/LOW fuzz levels. (one step for ASK/NZR etc) 2018-09-08 20:54:54 +02:00
Chris
e29bb51e76 chg;: idea of auto adjusting signal to zero mean baseline in order to compensate different antennas 2018-09-07 23:47:42 +02:00
Chris
3a338f566e chg: zero mean in hidfskdemod
chg: idteck demod return values
2018-09-06 21:44:53 +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
Chris
8b047ae9f5 cleanup 2018-09-05 19:13:39 +02:00
Chris
605d7a2343 FIX: just noice detection on device / client 2018-09-05 19:07:31 +02:00
Chris
ff16cbb4db FIX: USB Device descriptor issue, (@micolous, @megabug)
https://github.com/iceman1001/proxmark3/pull/243
1be25f9125
2018-09-03 19:04:53 +02:00
Chris
854bfc8595 FIX: two coverty scan bugs. 2018-08-18 15:22:59 +02:00
Chris
5f77121694 initial commit to be in sync the-soon-defunct repo pm3rdv40. 2018-08-12 21:54:31 +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
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
4a8e048694 chg: 'sc raw' added 't' param, for decoding apdu response
chg: i2c,  max timeout fitting for 256bytes frames
2018-07-09 13:15:28 +02:00
Chris
684a692bb0 chg: i2c clean up 2018-07-09 12:10:21 +02:00
Chris
2102b19d11 add: 'sc setclock' 0,1,2, allowed setting sim clocks.. 2018-07-09 11:51:19 +02:00
Chris
714de99f82 chg: i2c fixes. all working.
chg: 'sc info'  now prints url to atr decoder.
chg: 'sc reader' has more options  A, S
2018-07-09 11:22:51 +02:00
Chris
0d8e3160f8 chg: i2c - adjustments 2018-07-08 21:55:50 +02:00
Chris
da52b71135 chg: i2c more debugs 2018-07-08 20:01:34 +02:00
Chris
df4c0014f6 chg: i2c fixes 2018-07-08 13:52:30 +02:00
Chris
d4e471092f chg: i2c 'firmware version prints correct' 2018-07-08 12:33:42 +02:00
Chris
b49eea5637 chg: 'sc raw' -i2c correct lenght?
chg: 'sc upgrade' - warning message
chg: 'sc reader' - print right amount of bytes
2018-07-08 12:03:35 +02:00
Chris
ef318b56ec chg: i2c - don't mix different communications layers when reporting data back 2018-07-08 10:50:05 +02:00
Chris
ba1ccf1994 fix: i2c - stop() fix to wait for SCL to go HIGH (@olaf) 2018-07-08 09:18:08 +02:00
Chris
defc7d9070 chg: i2c increased some wait and better flow. 2018-07-07 12:42:33 +02:00
Chris
e77c4528d5 chg: i2c - added tracelogging
chg: i2c - new approach to GETATR
2018-07-06 20:14:55 +02:00
Chris
bfaf989eaa chg: i2c read.. add some extra time while SCL HIGH 2018-07-06 18:30:01 +02:00
Chris
c6eb251bfb chg: i2c.. swapped 2018-07-06 17:28:26 +02:00
Chris
bda57d3818 chg:i2c... 2018-07-06 17:20:02 +02:00
Chris
aef053879c chg: i2c timings. 2018-07-06 17:10:49 +02:00
Chris
a5d1ec0b22 chg:'i2c' timeouts.. 2018-07-06 16:01:23 +02:00
Chris
5dbebb3dc8 chg: sc reader - get atr 2018-07-06 15:20:21 +02:00
Chris
bcffde1198 chg: smartcard - wait until SCL goes high 2018-07-06 11:16:46 +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
2c4a528db2 chg: smartcard - code adjustments 2018-07-05 20:30:30 +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
44e300930f fix: sc upg 2018-07-05 11:22:43 +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
e09f9cbb32 add: RDV40 smart card module comms ( Thanks to @Willok! ) bitbanging i2c with it 2018-07-04 12:19:04 +02:00
Chris
35b7989b1c chg: OR in values. 2018-07-02 18:54:12 +02:00
Chris
17d406be1c chg: arm-none-eabi adaptations to macro 2018-06-30 19:02:59 +02:00
Chris
7bc8cd66cf chg: iclass output 2018-06-30 18:34:33 +02:00
iceman1001
c15e755e5f add: base64 support 2018-05-23 10:37:11 +02:00
iceman1001
2e6699273e chg: cleanup from offical repo 2018-04-18 20:17:00 +02:00
iceman1001
e56b8f3bda ophs.. 2018-04-03 10:02:54 +02:00
iceman1001
4b2a746ef5 ADD: 'hf mfu' detection of Mifare Ultralight NANO tags.
Interesting tag with two new commands.  LOCK_SIG  / WRITE_SIG.   Need to add support for it.
https://www.nxp.com/docs/en/data-sheet/MF0UN_H_00.pdf
2018-04-03 09:57:20 +02:00
iceman1001
11057f5806 chg: commented out some unused if-statements 2018-02-18 10:37:53 +01:00
iceman1001
ad99b4f394 add: 'hf list mf' - old 'hf mf sniff' decoding of data has now been incorporated annotations instead. (@merlokk)
---most likely broke something.. :)  needs proper testing.
2018-02-14 23:03:39 +01:00
iceman1001
554af51a54 fix: osx complains on sprintf 2018-02-01 17:37:05 +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
bcf6fcd193 fix: 'crc iclass' doesn't need byteswapping 2018-02-01 09:33:34 +01:00
iceman1001
e66b9c52b3 chg: some referense to "string.h" -> which should be <string.h> or removed. 2018-01-31 12:04:12 +01:00
iceman1001
bf25b1c9ba chg: crc16 got a compute_crc function 2018-01-30 03:31:11 +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
848decd711 rem: 'hf 15' - removed old bit-looped crc implementation 2018-01-29 16:36:59 +01:00
iceman1001
cbe313a569 chg: iClass crc is byteswap 2018-01-29 16:36:07 +01:00
iceman1001
095b3af43b CHG: 'hf 15' - swapped crc impl to table based. 2018-01-29 15:55:56 +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
51a65a0ce3 rem: removed unneeded function 2018-01-28 12:47:08 +01:00
iceman1001
0c827e755f chg: parameter adjustments 2018-01-28 12:42:17 +01:00
iceman1001
205e4b2300 chg: adjusted the input parameters for crc16 implementations. 2018-01-28 12:19:04 +01:00
iceman1001
1f5477491f chg: rename 2018-01-28 11:01:29 +01:00
iceman1001
e5804645f1 chg: most of the crc16 works.
ISO14443 crc A  = crc16_a
ISO14443 crc B  = ...
ISO15693 crc    = crc16_x25
2018-01-28 10:59:57 +01:00
iceman1001
e396575424 add: fast reverse 16bit 2018-01-27 23:16:35 +01:00
iceman1001
3943f87c30 chg 2018-01-18 16:31:07 +01:00
iceman1001
e18c360010 ADD: Calypso protocol commands 2018-01-18 16:26:56 +01:00
iceman1001
93ecfddb88 CHG: iso15 from b8f35947f2 @lnv42 2018-01-16 21:07:58 +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
398ca555b2 moved into common/polarssl 2018-01-02 11:17:59 +01:00
iceman1001
e67daf946d chg: added the config.. 2017-12-24 10:50:00 +01:00
iceman1001
a3ec7fd21f chg: 'hf emv' changes from @merlokk EMV4 commit 2017-12-24 10:26:47 +01:00
iceman1001
07ab8ea674 moved into here. 2017-12-24 10:23:55 +01:00
iceman1001
85f3870233 chg: removed old WITH_EMV , HAS_512_FLASH, defines, since emv now is native in client and we have automatic detection of 512kb size when compiling. 2017-12-24 10:23:04 +01:00
iceman1001
3e5bd575f6 syntax sugar 2017-12-24 10:22:02 +01:00
iceman1001
5d55807f37 add: cryptolibs needed in emv,
moved aes, des into here.
2017-12-24 10:21:28 +01:00
iceman1001
74b4755d42 moved function 2017-12-23 11:23:14 +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
44280abf62 chg: reverting back to more or less offical pm3 version. 2017-12-07 15:02:15 +01:00
iceman1001
1f637d726f fix to darkside overdue. I needed to remove my old impl.. 2017-12-06 17:15:24 +01:00
iceman1001
bc8b3534fe chg: renaming 2017-11-09 19:30:29 +01:00
iceman1001
30ceea4aea chg: cleaning up some function calls.
fix: check to see clock is bigger than zero.
2017-11-09 19:15:56 +01:00
iceman1001
609008b3ad chg: removed unneeded loop 2017-11-06 15:28:44 +01:00
iceman1001
881c7115a7 CHG: centralized the LF signal properties LOW/HIGH/MEAN/AMPLITUDE/ISNOISE into one struct.
CHG: 'data raw ar'  - didn't take in consideration the command line parameter CLOCK.
2017-11-06 15:06:42 +01:00
iceman1001
3b1c01cd13 CHG: 'lf search' - hitag/cotag wrong return values
CHG: is_justnoise - safety checks
CHG: 'hitag reader' - debug printing
2017-10-30 22:20:08 +01:00
iceman1001
54e8a0ae2b change demod printing 2017-10-30 20:33:11 +01:00
iceman1001
db56ca11a3 FIX: detect noise signal by measuring amplitude of signal. 2017-10-30 19:18:30 +01:00
iceman1001
6f948be842 CHG: some average / mean functions to enhance justNoise functions.
FIX: 'lf t55xx' - verifying that collected signal is not just noise..
2017-10-30 16:44:04 +01:00
iceman1001
b5842e8c1b fix: usb_cdc don't report that pm3 device is selfpowered.. (since its not by default) 2017-10-29 19:28:23 +01:00
iceman1001
5da60668dc chg: Serialnumber is shorter. Will be better for OSX ppl 2017-10-21 13:07:07 +02:00
iceman1001
4b63f940f1 CHG: FeliCa implemenation by @satsuoni 2017-10-20 20:27:44 +02:00
iceman1001
53333f22c8 fix: hw status (and USB comm in general) PR #434 : (@pwpiwi) 2017-10-20 16:32:42 +02:00
iceman1001
094f3dea0b FIX: Found the little bugger which has been haunting me for sometime now.
Maybe I can test my other new things?...
2017-10-20 15:17:03 +02:00
iceman1001
f8c0202403 CHG: reverting to official PM3 style cdc_acm
CHG:  Commented out OSprop and CompatIDFeatureDescriptor to fix compiler errors (@ceres-c)
2017-10-20 14:45:48 +02:00
iceman1001
b739076d99 FIX: reverted back to offical pm3 - waiting for flags to be cleared & set. 2017-10-19 14:03:45 +02:00
iceman1001
3b665be5fc chg: usb_cdc, it should be similar to official pm3. lets 2017-10-19 13:06:47 +02:00
iceman1001
1f0a1edfbe CHG: restored the wait in flash-mode. Its waiting for the device to "reboot"..
CHG: usb_Cdc,   :  usb specs say 100ms delay. Previous delay was much longer...
2017-10-17 23:09:32 +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
e47114bd65 FIX: MS feature descriptors now work when attaching device on Windows 8, 10
However:   there are some registry entries needed to be deleted when the device is NOT connected.
I'd created some batch files to run as administrator,  which deletes and queries the registry.
2017-10-13 10:39:33 +02:00
iceman1001
1d5e3fc217 fix: usb communications should be fine again. Inteface size must be 0x08, not 0x40 2017-10-12 15:13:18 +02:00
iceman1001
1cca109429 chg: validating we got a full usbcommand (512b) 2017-10-11 12:48:04 +02:00
iceman1001
480c0d0ba0 CHG: pm3 device will be identified on win10 automatic without drivers. Sadly no com port... 2017-10-11 12:46:38 +02:00
iceman1001
6cebcb4b0a CHG: replaced with a define 2017-10-11 10:17:01 +02:00
iceman1001
c9f37223ce FIX: at91sam7s256 has some limits on endpoints maxpacket sizes. Took me sometime to find it. 2017-10-11 10:15:41 +02:00
iceman1001
f788ef51d1 CHG: fiddling with USB_CDC and device identification on Windows. Still dodgy. This most likely will force you to JTAG update your device. *experimental warning* 2017-10-10 15:06:17 +02:00
iceman1001
e32cd18fd3 ADD: 'hf list felica' to be able to annotate Felica 2017-10-10 15:05:06 +02:00
iceman1001
3a0b205b7f chg: some extern 2017-10-10 15:03:33 +02:00
iceman1001
d3282e766a FIX: adjustments, the #define has the whiles already. 2017-09-28 23:14:51 +02:00
iceman1001
2934b22b05 CHG: fixing Header file 2017-09-28 22:39:07 +02:00
iceman1001
1e32ceb54c CHG: adding standalone as VPATH.. 2017-09-28 22:36:09 +02:00
iceman1001
72e53b0968 chg: disable emv for armsrc default. 2017-09-20 10:42:46 +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
6d98779ff8 chg: 'hf 15 read' - nice output and with lock info
chg: 'hf 15 readmulti' - nicer output and with lock info

You can still break the client if you ask to read too many blocks at one time.
I suggest 'hf 15 dump' instead for that purpose
2017-09-06 22:04:00 +02:00
iceman1001
9d0ce1e874 chg: 'hf 15 reader' minor output changes
chg: 'hf 15 info'  minor output changes
2017-09-05 08:25:23 +02:00
iceman1001
508fa76915 ADD: 'hf list 15' - added annotation for ISO15693 2017-09-04 18:38:57 +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
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
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
734ca940e9 fix: unified lf clone printouts of blocks. 2017-08-11 11:38:54 +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
c583570a3d minor styleish 2017-08-06 16:31:01 +02:00
iceman1001
0acc606be3 lf search is working :) 2017-07-31 12:31:39 +02:00