Commit graph

254 commits

Author SHA1 Message Date
Proxcloud 13c25f892e remove debug change 2018-02-08 19:43:03 +08:00
Proxcloud c179e7b1f8 remove old Manufacturer description code. fix Product description length 2018-02-08 19:37:55 +08:00
Proxcloud 8b9de94afe Remove BOS descriptor, leave just manufacturer descriptor for Android 2018-02-08 17:47:40 +08:00
Proxcloud 948b49c407 Add BOS USB descriptor. This allows non-root access on Android devices 2018-02-07 01:07:48 +08:00
Oleg Moiseenko d03fb293bc Emv4 - more additions to hf emv exec
* added rsa polarssl and changed sha1 location to polarssl dir
* deleted old sha1
* added emv-tools pk files
* added polarrssl wrapper sketch to emv_tols
* added test command
* added crypto polarssl with sda test
* added crypto tests and crypto_polarssl sha logic
* added SDA,DDA,fDDA,CDA
2017-12-23 16:46:43 +01:00
pwpiwi f380317220
Change USB Configuration to "Bus Powered" 2017-11-28 21:22:29 +01:00
pwpiwi 0363be9358 fix: USB Power requirements
* correctly indicate the maximum current drawn from the USB bus
2017-11-17 09:13:37 +01:00
Oleg Moiseenko fe6bf3c58c improve hf 14a info (#457)
* added validate_prng_nonce from iceman1001 fork
* added DetectClassicPrng from iceman1001 fork
2017-11-01 17:48:59 +01:00
pwpiwi 3851172d81 Revert "Comms refactor (prerequisite of libproxmark work) (#371)" (#450)
This reverts commit afdcb8c159.
2017-10-27 09:56:46 +02:00
Michael Farrell afdcb8c159 Comms refactor (prerequisite of libproxmark work) (#371)
* Refactor the comms code only from PR#346, without comms_globals.h.
* OSX: Add note for example serial port
2017-10-26 21:54:27 +02:00
Michael Farrell 05b6b11785 Multiple USB-CDC changes (attempt 6) (#439)
- Fix reporting of string descriptors.
- Add note about ModemManager matching on the manufacturer string.
2017-10-23 09:04:06 +02:00
pwpiwi f194e4290c Device side USB implementation:
* add some comments and #defines in usb_cdc.c
* use full FIFO size of 64 Bytes for device -> host transfers
2017-10-17 19:25:40 +02:00
Iceman 9d0a333449 wrong define used (#421)
The set define under the case "STD_SET_CONFIGURATION" is not the same as here.
The endpoint is configured as INTERUPT not ISOCHRONOUS
2017-10-16 18:16:39 +02:00
marshmellow42 1dae9811f2 Indala fixes - set accurate preamble and start of.. (#385)
.. data for both format types (64 bit and 224 bit)
also adjust 224 bit demod and clone to output and input in PSK2 instead
of PSK1 as this appears to be most common for this format.
2017-08-27 12:10:28 +02:00
pwpiwi 930763e86d Use PolarSSL DES implementation (GPL 2 or later) for both client and firmware (#378)
to prevent licensing issues with ARM-Crypto-Lib (GPL 3 or later)
2017-08-22 10:04:47 +02:00
marshmellow42 0e2ddb4196 add data fsktonrz fsk cleaning util (#352)
add fsk cleaning / demod tool fsktonrz
- used old fskdemod for HID and adjusted it to build the tone tables for any fsk model detected or given.  using the tone tables we are able to convert the fsk to clear strong NRZ/ASK even with very weak fsk waves.
- also fixed a small textual bug in `lf search u` output
- also added more graph clearing code to help ensure the demod overlay doesn't show when it shouldn't...
- and improved strong NRZ clock detection.
- fixed bugs in places it used old static values instead of dynamic read values. and removed redundant items.
2017-07-12 07:31:42 +02:00
marshmellow42 67e344df90 iclass - updates
clean up output
allow readblock without authenticating (can read blocks 0, 1, 2, 5
without authenticating.)
add Application Issuer Area to reader output and use it to attempt to
identify legacy vs NOT legacy.
2017-06-21 17:07:55 -04:00
pwpiwi 3a89d04c7f more fixes to USB communication
- use modified UDP_GET/UDP_SET_EP_FLAGS macros from @iceman1001's branch
2017-04-24 18:16:47 +02:00
pwpiwi 1f42ccddfb fix USB descriptors
- indicate compliance with USB release 2.0
- set correct vendor and product IDs
- indicate power consumption (500mA)
- add String Descriptor 0 indicating supported languages
- add String Descriptors for Manufacturer and Product
2017-04-24 14:19:39 +02:00
pwpiwi b62b5e2527 Merge pull request #277 from pwpiwi/clang_warnings
fix clang compiler warnings (including fixing a bug revealed in cmdhftopaz.c)
2017-04-19 18:11:46 +02:00
marshmellow42 1c70664ae7 finish FSK graph index changes 2017-04-15 16:18:54 -04:00
marshmellow42 c4f51073fc combine autocorr, dirth functions
fix lfdemod bug
add askedge to overlays (remove askdemod)
2017-04-13 10:33:18 -04:00
marshmellow42 9fe4507c03 update more demods for graphing
still todo fsk based tag demods (like HID, AWID, IO, Pyramid...)
2017-04-12 17:55:31 -04:00
pwpiwi 31a29271b9 fix clang compiler warnings (including fixing a bug revealed in cmdhftopaz.c) 2017-04-11 18:55:33 +02:00
marshmellow42 0f321d631a align clock grid with demods on graph 2017-04-11 10:34:43 -04:00
marshmellow42 0aed2199a4 fix pskclockdetect bug 2017-04-07 17:41:22 -04:00
marshmellow42 bf85d22f96 fix bug in st detect +
adjust nrz t55xx detection to reduce false positives on weak antennas
adjust t55xx read wait to get past initial startup wave.
2017-04-04 17:22:21 -04:00
marshmellow42 b97311b1bd lf improvements
fix noralsy demod bug (st should be true)
fix sprint_bin_break bug (didn't print last bit)
add a function to save/restore demodbuffer
remove redundant countFC call in PSKDemod
clean up pskclockdetect functions
fix indala26decode bug (end of data sometimes not correct)
improve PSK detection / demodulation
improve NRZ detection
improve t55xx commands & fix a few bugs
add t55xx page1 detection - added it to lf search
added experimental t55xx testmode write
2017-04-04 11:52:10 -04:00
marshmellow42 4ab135c0cd a few more tools for em4x05 writing.
ready to begin coding cloning cmds to em4x05.
2017-03-31 12:14:28 -04:00
marshmellow42 f2ea55fb3c fix/update removeParity & fix securakey detection 2017-03-29 10:02:29 -04:00
Iceman d95878f802 Merge pull request #251 from marshmellow42/master
split fdx-b demod to its own file
2017-03-26 14:35:42 +02:00
marshmellow42 4db6f3bbb9 split fdx-b demod to its own file
added @iceman1001 s read/sim/clone commands for fdx--b
check changelog.md for cli changes!
2017-03-26 08:09:40 -04:00
pwpiwi 1f065e1dad Refactor parity functions
- get rid of __asm function in crapto1.h, use gcc builtin function instead
- make parity functions available in common directory
2017-03-25 22:03:17 +01:00
pwpiwi 4cb4b588c2 Deduplicate mfkey32 and mfkey64
- rename client/nonce2key.[ch] to mfkey.[ch]
- leave only main() wrapper in tools/mfkey
- add mfkey32 and mfkey64 to .gitignore
2017-03-23 18:38:17 +01:00
pwpiwi bd2797de15 fix: compile issue on RasPi (http://www.proxmark.org/forum/viewtopic.php?id=4678) 2017-03-23 06:45:42 +01:00
pwpiwi 7ac59a82ab Merge pull request #235 from marshmellow42/lfdemod_refactors
lfdemod refactor
2017-03-21 15:38:17 +01:00
marshmellow42 86b8ecb56e adjust ManchesterEncode
removed dead size check
added a max size of 2k input bits (4k out)
this shouldn't overload the array memory passed to it typically...
2017-03-21 09:53:14 -04:00
pwpiwi 7779d73c71 Code cleanup: Refactoring nonce2key
- include nonce2key() in mifarehost.c
- remove tools/nonce2key
- simplify mifare_autopwn.lua
2017-03-20 21:16:57 +01:00
pwpiwi de867f502f fix: crapto3.3 sometimes crashing with hf mf mifare on Fudan clones (no par, all NACK) (#233)
added readme.txt again in tools/nonce2key
2017-03-20 21:05:26 +01:00
marshmellow42 ec187c2f9f line break 2017-03-15 11:07:52 -04:00
marshmellow42 6f36848f9e refactor pskdemod - remove nrz.._ext 2017-03-15 10:53:32 -04:00
marshmellow42 56de46b466 further refactor 2017-03-14 17:08:58 -04:00
marshmellow42 d87bf1567a move new functions to utilities area 2017-03-14 16:24:14 -04:00
marshmellow42 c83d6dc6fa continue refactor detectST
detectST should be done now...
2017-03-14 16:20:15 -04:00
marshmellow42 127f149075 add first attempt at lf miller decoding
don't have any tags capable to test and not yet hooked up to data
rawdemod...
2017-03-14 13:16:30 -04:00
marshmellow42 549daaf778 fixed bug in new refactored detectST
forgot to return i...
2017-03-13 13:27:38 -04:00
marshmellow42 d5051b9817 meant to put clock detection before demods
... fixing that.
no code changed here...
2017-03-12 23:11:52 -04:00
marshmellow42 bf74114d50 refactor detectST a little...
+ a little more shuffling
2017-03-12 22:57:01 -04:00
marshmellow42 4d3c179669 re-organize lfdemod.c
sorry but it was ugly  (still is... but i can get to things easier)
2017-03-12 22:47:50 -04:00
pwpiwi 0ca9bc0e99 Upgrade crapto1 library to v3.3 (#232)
- fix standalone tools mfkey32, mfkey64 and nonce2key to use common crapto1 library
- fix compiler warnings in tools/mfkey/mfkey64.c and tools/nonce2key/nonce2key.c
- allow crapto1.c to compile on ARM hosts
- add @iceman1001's readme.txt to tools/mfkey
2017-03-12 15:05:54 +01:00