RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-09-23 00:37:14 +08:00
Code Issues Packages Projects Releases Wiki Activity
17897 commits 3 branches 14 tags 86 MiB
Commit graph

11204 commits

Author SHA1 Message Date
team-orangeBlue b82857f892
Compilation workaround 
May be reverted if fails

Signed-off-by: team-orangeBlue <63470411+team-orangeBlue@users.noreply.github.com>
 2023-12-03 12:05:15 +03:00
team-orangeBlue da984783a8
Merge branch 'RfidResearchGroup:master' into PlusPlus 2023-12-03 11:28:48 +03:00
team-orangeBlue 29773e92ca
Fix typo, correct data 
2 new keys (SL3 sector switch; SL1SL3Mix sector switch).
"instead of than" - removed the than.

Signed-off-by: team-orangeBlue <63470411+team-orangeBlue@users.noreply.github.com>
 2023-12-03 11:24:38 +03:00
team-orangeBlue 046237500b
Proper block data for Mifare Plus 
All blocks are NOT data blocks
Some are now config/management keys/sector keys/...

Signed-off-by: team-orangeBlue <63470411+team-orangeBlue@users.noreply.github.com>
 2023-12-03 10:28:32 +03:00
wh201906 bb529a9077
Fix corrupted data caused by CMD_WTX 
No need to wait for 2.5s (1s + FPGA_LOAD_WAIT_TIME) if the real-time
sampling stops.
Make sure the LF bitstream is loaded before real-time sampling so the
response of CMD_WTX won't appear.
 2023-12-02 17:04:03 +08:00
team-orangeBlue ce99e86997
New arguments 
Won't compile otherwise

Signed-off-by: team-orangeBlue <63470411+team-orangeBlue@users.noreply.github.com>
 2023-12-01 23:49:19 +03:00
team-orangeBlue 91f574ab19
More arguments 
Add support for writing special blocks
Add custom command bytes

Signed-off-by: team-orangeBlue <63470411+team-orangeBlue@users.noreply.github.com>
 2023-12-01 23:48:45 +03:00
team-orangeBlue a523c1e062
New crypto 
Add encryption
Add key updating
Add config updating

Signed-off-by: team-orangeBlue <63470411+team-orangeBlue@users.noreply.github.com>
 2023-12-01 23:47:45 +03:00
iceman1001 f3a9629895 style 2023-12-01 15:25:09 +01:00
wh201906 f8605311f7
Use real-time sampling with high sample size 2023-12-01 19:58:00 +08:00
iceman1001 a913b2c662 style 2023-12-01 10:59:18 +01:00
iceman1001 bcbe76064d Changed modulation max bit length from 512 to 4096, since we now can get much longer traces 2023-12-01 10:58:33 +01:00
Iceman 17a93a3b1b
Merge pull request #2173 from wh201906/lf_sniff_clean 
Real-time LF sampling
 2023-12-01 10:54:10 +01:00
Adam Jon Foster 8dea0d3203
Create hf_mf_uid_downgrade.lua 
Adding hf_mf_uid_downgrade, which allows you to add a fc and cn to a UID of a Mifare Classic. 

Signed-off-by: Adam Jon Foster <me@evildaemond.com>
 2023-11-30 21:40:14 +08:00
wh201906 45df618b7c
Fix segmentation fault 2023-11-30 18:42:30 +08:00
iceman1001 e026c712c1 hf 14a info now tries to read QL88 sigantures and verify them 2023-11-28 11:08:17 +01:00
iceman1001 fbdb268445 QL88 signature Public Key was identified as Manufacture Mifare Classic before. Now added tests and checks.\nnext step is to use the S17/B key to read the signature 2023-11-28 11:00:48 +01:00
Iceman d8da2902fb
Merge pull request #2178 from hamptonmoore/avigilon-56 
Implement Avigilon 56bit format
 2023-11-27 14:55:33 +01:00
nvx 7b0ca43695 Fix iClass dump truncating the AA2 area and improve dump reliability by fixing cmd retry delays. 2023-11-26 19:04:54 +10:00
Hampton Moore 345303de37 Implement Avigilon 56 format 2023-11-25 21:48:33 -05:00
wh201906 10ab013f5b
Use defined return value 2023-11-25 11:09:16 +08:00
Iceman 56b5bde713
Merge pull request #2186 from wh201906/fix_emv_reader 
Fix `ExchangeAPDUSC()` in `cmdsmartcard.c`
 2023-11-25 03:34:15 +01:00
wh201906 493383c995
Fix ExchangeAPDUSC() in cmdsmartcard.c 
It doesn't return 1 if the retry fails, which is different from the
behavior of the first try.
 2023-11-24 22:20:26 +08:00
wh201906 ee64e71f69
Fix client build with Python 3.12 
Caused by upstream bug
https://github.com/python/cpython/issues/106560
The fix is like this
bbdf6d4653
 2023-11-24 13:12:07 +08:00
wh201906 e82fb8b67f
Use calloc() instead of malloc() 
Suggested by @iceman1001
Mainly for 8b6a274e28
Replaced the malloc() in getSamplesFromBufEx()
Added memory allocation result check for getSamplesFromBufEx(),
lf_read_internal(), and lf_sniff()
 2023-11-17 12:38:20 +08:00
Iceman 7fb5a5a743
Merge pull request #2179 from JohnELester/patch-1 
Update mfc_default_keys.dic
 2023-11-17 04:31:18 +01:00
wh201906 0b9f11a249
Add a slider in the plot window for navigation 2023-11-17 10:59:14 +08:00
Pathfinder cee46928ca
Update mfc_default_keys.dic 
Signed-off-by: Pathfinder <john.e.lester@gmail.com>
 2023-11-16 09:37:38 -05:00
wh201906 3ee13c9ba6
Apply suggestions from @henrygab 
Check if memory allocation fails
Fix memory leak
Initialize struct in declaration
Add/Fix some notes
Remove unlikely() in favor of readability
Remove a hard-coded magic number
 2023-11-15 18:04:52 +08:00
wh201906 835b7a9150
Add support for trigger threshold 2023-11-14 13:12:35 +08:00
wh201906 ab9f49f86e
Some minor fixes 
Use longer timeout in WaitForRawDataTimeout() to handle CMD_WTX
Fix a wrong type
Apply changes to other similar part
Remove unused instructions
 2023-11-14 10:46:45 +08:00
wh201906 8b6a274e28
Bigger graph buffer 
1280000 samples -> 10.24s for 125kHz 8bit sampling

Allocate graph related memory on heap
 2023-11-14 10:05:13 +08:00
wh201906 42ab3ee1e6
Receive raw LF samples on the client 2023-11-14 09:42:44 +08:00
wh201906 8fdf04fcfb
Receive raw data on the client 2023-11-14 02:17:45 +08:00
wh201906 9e8b1ceda7
Reduce duplicate payload structure for lf read/sniff 2023-11-14 01:05:27 +08:00
Philippe Teuwen 4f9016814e Revert "Release v4.17511 - Faraday" 
This reverts commit 6e9df18de6.
 2023-11-13 10:19:09 +01:00
Philippe Teuwen 6e9df18de6 Release v4.17511 - Faraday 2023-11-13 10:19:09 +01:00
Philippe Teuwen e0be057f62 Get Python support of experimental_client_with_swig working again 2023-11-13 10:13:14 +01:00
Philippe Teuwen 97f2770982 Ignore mbedtls header sitch-enum warnings 2023-11-13 09:25:41 +01:00
Grayson Martin e65263c73b
run make style 2023-11-11 14:32:09 -06:00
Grayson Martin db3c86958a
implement smartcard daemon relay for iso14b cards 2023-11-11 14:30:31 -06:00
Grayson Martin 4e346e8ca2
Merge branch 'master' into smartcard-relay 2023-11-11 13:05:11 -06:00
Philippe Teuwen a42cb6dea1 experimental_lib/example_c port as arg 2023-11-11 18:24:34 +01:00
Philippe Teuwen 9f8c02bf96 fix CWE-562: Return of Stack Variable Address 2023-11-11 18:24:34 +01:00
Philippe Teuwen ba8e90edfd make style 2023-11-11 18:24:34 +01:00
iceman1001 169d31cc8e fix coverity 265059 2023-11-11 16:53:06 +01:00
iceman1001 8e2e1d4cb4 fix coverity 420049 2023-11-11 16:50:23 +01:00
iceman1001 2401a0e27b fix coverity 420050 2023-11-11 16:47:45 +01:00
iceman1001 0924cb30bb fix coverity 421621 2023-11-11 16:46:32 +01:00
iceman1001 7f2bc916d4 use local fct instead 2023-11-10 00:32:10 +01:00
Oleg Moiseenko fdfe8869ae
Update cmdhfmf.c 
Signed-off-by: Oleg Moiseenko <807634+merlokk@users.noreply.github.com>
 2023-11-09 01:35:26 +02:00
iceman1001 c1ec770a69 changed "hf 14a info" to also give a hint for NTAG424 tags 2023-11-07 21:41:42 +01:00
iceman1001 7adadde5f5 added support to verify UL AES signatures. This tag supports of randomizing UID and mixing with AES keys, making a generic signature algo a bit harder. But for the non mixed signature check it should work. Also added Ul AES version for it to be correct identified. 2023-11-07 21:22:25 +01:00
iceman1001 c60503560c more defines and fix termux compilation 2023-11-07 15:44:12 +01:00
iceman1001 c3543c4610 adapting cmakefile to the client cmakefile. 2023-11-07 13:59:54 +01:00
iceman1001 01aaad7866 text 2023-11-07 13:55:39 +01:00
iceman1001 5dd144b193 reworked autopwn to allow for user to supply multiple keys in command line. All is merged with default array and dictionary if suppolied when doing dictionary attack 2023-11-06 23:52:05 +01:00
iceman1001 6653bffe00 coverity fixes 2023-11-06 22:58:14 +01:00
iceman1001 be63138016 fix wrong types 2023-11-06 17:07:16 +01:00
Oleg Moiseenko 73f5270fa2
Update cmdhfmf.c 
Signed-off-by: Oleg Moiseenko <807634+merlokk@users.noreply.github.com>
 2023-11-06 16:01:56 +02:00
merlokk f2110c11ae fix text 2023-11-06 15:56:51 +02:00
merlokk 70e39ec0c4 check return code 2023-11-06 15:52:54 +02:00
merlokk 6606225686 add change password command 2023-11-06 15:48:18 +02:00
merlokk e32ca56084 gen4 commands refactoring 2023-11-06 14:22:21 +02:00
Oleg Moiseenko 7692f09760
Merge pull request #2162 from merlokk/ginfo_add 
Ginfo add some additional info
 2023-11-06 14:04:32 +02:00
merlokk f617cac993 fix password parameter in the command 2023-11-06 13:55:49 +02:00
merlokk c215752b6e add some hints on the ginfo config values and double-check correctness 2023-11-06 13:51:56 +02:00
wh201906 2d48e33a99
Some small fix 2023-11-06 18:45:10 +08:00
wh201906 85e38ddc38
Add --ms option in hw status 
To specify the timeout of connection speed test
 2023-11-06 16:35:43 +08:00
merlokk b44c214009 fix 2023-11-06 10:28:37 +02:00
merlokk 0a22fd8f66 uid len details 2023-11-06 10:25:13 +02:00
merlokk c6bf1cefe3 fix format 2023-11-06 00:45:14 +02:00
merlokk 4c828f4424 view format 2023-11-06 00:35:48 +02:00
merlokk 2077ea7da5 decode config 2023-11-06 00:30:13 +02:00
merlokk 7afaaf8535 style 2023-11-06 00:29:42 +02:00
merlokk 910c4d8c92 make style 2023-11-06 00:29:28 +02:00
merlokk ac970064d3 add timeout error 2023-11-06 00:19:45 +02:00
merlokk 89c19fce9c ad test data decoding 2023-11-05 23:51:52 +02:00
merlokk 6ae1bae8c0 ginfo command works and shows raw data 2023-11-05 23:43:05 +02:00
merlokk 70eb1b1391 add low level g4 info commands 2023-11-05 22:09:30 +02:00
merlokk e6e757865e add gen4 commands 2023-11-05 21:58:50 +02:00
merlokk 282d22c3cc add ginfo comamnd 2023-11-05 21:11:55 +02:00
iceman1001 7026fd69fb pedantic fix 2023-11-05 15:40:36 +01:00
iceman1001 c9bee6d3b8 pointer to buffer. Zero sized array not allowed when pedantic 2023-11-05 15:38:21 +01:00
iceman1001 8f7d7a2dd4 fix mem leak and add new pacs style decoding when reading block 7 2023-11-05 15:30:25 +01:00
iceman1001 eb8c2d1b6a move file operations to fileutils.c 2023-11-05 11:52:12 +01:00
iceman1001 fdacd67626 pedantic fix 2023-11-05 11:26:39 +01:00
iceman1001 9dba9f275c fix missing return 2023-11-05 02:17:52 +01:00
iceman1001 a69eed7950 fix missing loaded counter 2023-11-05 02:11:24 +01:00
iceman1001 2ccf84f40a use a local str_nlen fct instead of hinting to POSIX 2023-11-05 02:08:30 +01:00
iceman1001 9c1644cd73 support loading of flipper zero .picopass files. Also adapted to naive detect if PACS w variable length encoded is present 2023-11-05 01:50:32 +01:00
iceman1001 4df28b88d3 fix 2023-11-03 15:47:45 +01:00
iceman1001 83b9057473 fix 2023-11-03 15:44:28 +01:00
iceman1001 f58b4603ba fix 2023-11-03 15:42:13 +01:00
iceman1001 dfdaa41987 wrong string formatter 2023-11-03 15:41:07 +01:00
iceman1001 b09c3ac67c default type of ENUM in C is INT. the tagtype enum broke it. Converted to DEFINES since you cant change type of an ENUM 2023-11-03 15:39:28 +01:00
iceman1001 b7028bb798 init fixes 2023-11-03 12:55:23 +01:00
iceman1001 c793363b4f pedantic fixes 2023-11-03 12:52:01 +01:00
iceman1001 ea249d7b17 fixes 2023-11-03 12:20:30 +01:00
iceman1001 a2fcd47017 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2023-11-03 11:49:16 +01:00
iceman1001 ffb6f4ddbb remove default build to add debugging info 2023-11-03 11:48:47 +01:00
Iceman b405706fb8
Merge pull request #2153 from Antiklesys/master 
Update cmdhficlass.c
 2023-11-03 11:39:08 +01:00
iceman1001 4708940c69 wrong struct when pasting 2023-11-03 01:46:42 +01:00
iceman1001 5471d326b7 macOS complains about memory alignment when type casting. memcpy should sort it 2023-11-03 01:41:22 +01:00
iceman1001 85fafb5906 type confusing 2023-11-02 17:19:42 +01:00
iceman1001 bae03ec792 type confusing 2023-11-02 17:14:37 +01:00
iceman1001 3d91806b5b use correct define 2023-11-01 23:40:33 +01:00
iceman1001 e5d2fc3fa7 some color to MFU dump output 2023-11-01 23:40:10 +01:00
iceman1001 b17f5ef45c fix nfc MFC dump file loading 2023-11-01 23:39:42 +01:00
Jean-Michel Picod c08e26ca26 Add alternative chip ID 2023-11-01 10:40:53 +01:00
iceman1001 6423a0ec76 file extension needed? 2023-11-01 07:57:45 +01:00
iceman1001 9f439fde4e fix some ndef decoding 2023-11-01 07:57:13 +01:00
iceman1001 98b7bd75d6 seems nfc mifare classic dumps used "blocks" instead... 2023-11-01 03:17:48 +01:00
iceman1001 a92e712cfe fix bad comparisions 2023-11-01 03:06:10 +01:00
iceman1001 ae6ba395b4 added support for loading flipper MFC/MFU dump files.\nFixed NFC DECODE to identify and handle MFU dump files properly 2023-11-01 02:43:10 +01:00
Daniel Karling 5a750da4ef Removed wrapper for desfire_print_signature 
Not needed now when the unused parameter is gone.
 2023-10-31 08:19:17 +01:00
Daniel Karling ee3a223e37 Implemented 'info' command for NTAG424 2023-10-31 08:16:07 +01:00
Henry Gabryjelski 939d3d4a93 Remove incorrect message (my own regression) 2023-10-30 17:26:07 -07:00
iceman1001 17844afe9d more verbose output for failues when loading json files 2023-10-31 01:07:19 +01:00
iceman1001 c48f305483 more verbose output for failues when loading json files 2023-10-31 00:58:50 +01:00
iceman1001 f523d2917b fix string formatters 2023-10-31 00:43:44 +01:00
iceman1001 9835543a2f apply fix for v3 2023-10-31 00:03:53 +01:00
Iceman b50b405128
Merge pull request #2155 from henrygab/mf_dump_fix 
Fix mf file loading error
 2023-10-30 23:59:17 +01:00
Henry Gabryjelski f2ed7d1299 Fix mf file loading error 
Code was incorrectly checking if loop variable
`i` was greater than maximum data length,
rather than checking current buffer pointer.
 2023-10-30 15:46:37 -07:00
iceman1001 5b7486553f remove unused param in desfire_print_signature 2023-10-30 22:53:41 +01:00
iceman1001 75a70cbf53 updating json format for mfc 2023-10-30 22:22:22 +01:00
iceman1001 5ca29246e9 fix GH code alert 2023-10-30 16:08:42 +01:00
iceman1001 f47fb2f74d adapt data bmap to handle calls without -m. 2023-10-30 16:07:13 +01:00
iceman1001 b9dcd143d5 style 2023-10-30 13:11:52 +01:00
iceman1001 2763ead13b fix the free ctx calls 2023-10-30 13:05:46 +01:00
iceman1001 b0ee6ae67b fixes ntag424 2023-10-30 12:55:23 +01:00
Antiklesys 7cbadad163 Update cmdhficlass.c 
Updated to use arraylen as suggested by iceman, but to do so without facing other issues /buggy behaviors I had to perform additional code changes.
 2023-10-30 18:34:11 +08:00
Antiklesys 9fb17c78c3 Update cmdhficlass.c 
Fixed ranges for configcards generation
 2023-10-30 11:32:36 +08:00
Iceman c3abea803b
Merge branch 'master' into master 
Signed-off-by: Iceman <iceman@iuse.se>
 2023-10-29 21:13:08 +01:00
Daniel Karling d4f8c42d3c Added additional command examples 2023-10-29 17:13:27 +01:00
Daniel Karling 912c126266 Added encrypted comms to ReadData and WriteData commands 
This allows reading and writing to the "proprietary" file (number 3),
or file 2 if it's set to "full" communications mode.
 2023-10-29 16:49:11 +01:00
Daniel Karling 6d290f1bae Less magic numbers, more refactoring 2023-10-29 13:50:31 +01:00
Daniel Karling 1eaf8d0e80 Fixed incorrect order of sdm access rights in command help 2023-10-28 10:33:30 +02:00
Daniel Karling 05a2302466 Implemented style 2023-10-27 18:09:38 +02:00
Daniel Karling ad875a8c01 Refactored communication encryption 2023-10-27 17:25:48 +02:00
Daniel Karling eb29e1a17e Cleanup 
* Added some comments
 * Changed name of offsets to sdm_data since this is more apt. Not all
   of them are describing offsets
 * Fixed dumb bug in MAC refactor
 2023-10-27 07:45:40 +02:00
Antiklesys 81b116c23f Fixed keyroll mode for hf ic configcard 
Was able to compare the output of nfc-iclass and I identified two bugs in the generation of blocks 0x0D (was being overwritten with FF, it seems this was an original bug in the original pm3 code?)
Fixed the porting for block 15 generation.
 2023-10-27 13:21:49 +08:00
Daniel Karling 011d1f6a44 Refactored MAC and IV calculations 2023-10-27 06:52:30 +02:00
Daniel Karling 70422937f2 Partial implementation of NTAG424 commands 
Noteworthy stuff that's missing:
* Encrypted read/write to file.
* Handling of CC and Proprietary file

Stuff that works:
* Read/write file
* Get/change file settings
* Change auth keys
* Configuring SDM/SUN feature
 2023-10-26 22:10:00 +02:00
wh201906 de7b6f35bc
Clean up the code for timeout 
Rename UART_TCP_CLIENT_RX_TIMEOUT_MS to UART_NET_CLIENT_RX_TIMEOUT_MS
Add UART_UDP_LOCAL_CLIENT_RX_TIMEOUT_MS for shorter timeout
Check if the target address is local in uart_open()
 2023-10-25 23:45:23 +08:00
s00se 51bea8995b
cmdscript.c: explicitly include ctype header 
https://bugzilla.redhat.com/show_bug.cgi?id=2245823

Signed-off-by: s00se <95649696+s00se@users.noreply.github.com>
 2023-10-24 16:00:22 -06:00
wh201906 fcad2127e0
Merge branch 'master' into bind 2023-10-23 13:57:18 +08:00
wh201906 56b4bda50d
Add bind option for TCP 2023-10-23 13:56:16 +08:00
wh201906 15ef4f6768
Add bind option (UDP, Windows) 2023-10-23 13:30:27 +08:00
Philippe Teuwen e20742dd04 lf_em_tearoff: oops accept absence of pwd 2023-10-22 22:39:01 +02:00
Philippe Teuwen 675c86ec98 lf_em_tearoff: better safe than sorry 2023-10-22 22:06:13 +02:00
Philippe Teuwen baecf19801 fix lf_em_tearoff 2023-10-22 21:02:10 +02:00
iceman1001 3a2b2dffae add some colors 2023-10-22 19:57:48 +02:00
wh201906 225b1894f9
Add bind option (UDP, Linux) 2023-10-23 01:48:38 +08:00
iceman1001 fd121bab4f added nosave parameter to lf em 4x05 dump 2023-10-22 18:56:19 +02:00
iceman1001 a2fdab98b5 style 2023-10-22 14:20:20 +02:00
iceman1001 b857369f7a fix some warnings 2023-10-22 14:19:01 +02:00
iceman1001 9a9d2cf621 added a new command -data bmap- it breaks down a hex value in rows of bits according to a supplied template 2023-10-22 14:08:18 +02:00
iceman1001 2fed756dd9 added desfire AID entries from the Metrodroid Project. https://github.com/metrodroid/metrodroid/wiki/DESFire-Applications-IDs 2023-10-21 17:07:47 +02:00
iceman1001 854a95db6c added MAD entries from the Metrodroid Project. https://github.com/metrodroid/metrodroid/wiki/DESFire-Applications-IDs 2023-10-21 15:45:12 +02:00
iceman1001 272cb2bbc5 added no save parameter to iclass dump. Also adjusted the text for the other places. 2023-10-20 16:54:44 +02:00
Iceman c8f5c54257
Merge pull request #2143 from Antiklesys/master 
Modified hf iclass calcnewkey
 2023-10-20 16:43:16 +02:00
Philippe Teuwen c4ff847355 typo 2023-10-20 14:49:39 +02:00
Antiklesys 2790bc0c16 Modified hf iclass calcnewkey 
Added support for a scenario in which the old key is elite and the new key is not elite.
 2023-10-20 20:30:16 +08:00
iceman1001 0dc921c6b7 added the udpv6 and also try to identify when v6 is used (tcp/udp) 2023-10-20 12:51:12 +02:00
iceman1001 a35bfbb13e modified the CLI prompt to also show if TCP/UDP is used in the communication 2023-10-20 10:38:53 +02:00
Philippe Teuwen b9ae38f888 Add timing to hw ping, reduce sleep to 1ms in WaitForResponse, no impact on CPU 2023-10-20 00:36:46 +02:00
iceman1001 31bc88f684 style 2023-10-19 21:42:01 +02:00
Antiklesys e2f7454abc Fixed command description 
Fixed command help file as it incorrectly shows -b instead of --blk
 2023-10-19 23:35:09 +08:00
iceman1001 0a42e92d11 fix compilation errors for strlen call that doesnt like uint8_t arrays 2023-10-19 14:40:48 +02:00
iceman1001 8565781f66 text 2023-10-19 14:22:13 +02:00
iceman1001 ae1504e763 fixed a boolean bug with write block, and added a hf mf encodehid which writes some simple ndef message to a empty MFC 1K card 2023-10-19 14:21:46 +02:00
iceman1001 34d8a41021 hw ping - fix output text 2023-10-19 11:08:53 +02:00
iceman1001 1f3cf80898 style 2023-10-18 20:34:35 +02:00
iceman1001 185da09e62 we use calloc 2023-10-18 20:20:55 +02:00
iceman1001 efac735bad added support for HID SAM picopass communications. Nasty array copying but does the trick. Will need refactoring. 2023-10-18 19:59:34 +02:00
Self Not Found 7dbdc7cf10
Add short flag -m for timeout related commands 2023-10-18 18:47:32 +08:00
Jean-Michel Picod dbe0412311 Simplify quote handling 2023-10-18 10:38:33 +02:00
Jean-Michel Picod 3b7cec365a Support double-quoted arguments in CLI 
When a quoted command argument is seen, it will take all characters
until the next double-quote (no supported escape sequence here for
simplicity).
All white spaces (space, tab, etc.) are then removed from the argument.

This means that the following command should behave the same:
```
pm3> wiegand encode --fc 101 --cn 1337
pm3> wiegand encode --fc "1 0 1" --cn "1    3    3   7"
```

Or a more useful example, when copy/pasting hex formatted values:
```
pm3> hf iclass calcnewkey --old 1122334455667788 --new 2233445566778899
pm3> hf iclass calcnewkey --old "11 22 33 44 55 66 77 88" --new "22 33 44 55 66 77 88 99"
```
 2023-10-18 10:27:12 +02:00
wh201906 5e22ed25bc
Add UDP support on Windows 2023-10-17 22:48:12 +08:00
iceman1001 78e1a84515 added the timeout to preferences, so its stored in the pref file but... there need to be adaptations to the uart_p*/uart_w* files to use the the session value.. 2023-10-17 14:54:44 +02:00
wh201906 d1f916ba25
Reduce the default communication timeout for local IPv6 address 2023-10-17 20:20:21 +08:00
wh201906 d9b5afbb92
Add IPv6 support for TCP (Windows) 2023-10-17 19:40:41 +08:00
wh201906 67d36152cc
Add IPv6 support for UDP (Linux) 2023-10-17 18:40:17 +08:00
wh201906 2e0c24c8f2
Add IPv6 support for TCP (Linux) 2023-10-17 18:32:13 +08:00
wh201906 bd34794d26
Add error handling 2023-10-16 21:12:14 +08:00
wh201906 703a2c968a
Faster uart_receive() in UDP mode 
Added some functions for writing data to the ring buffer directly
Increased the size of ring buffer
 2023-10-16 20:05:42 +08:00
iceman1001 d738f3171c maur, thanks to Randy! 2023-10-16 10:14:38 +02:00
wh201906 3df58f3a9e
Clean up 2023-10-16 02:09:22 +08:00
wh201906 5775b53078
UDP support on Linux 2023-10-16 01:56:03 +08:00
wh201906 7aef669e59
Add ringbuffer 
This is used in the UDP connection
 2023-10-16 01:52:27 +08:00
iceman1001 13f9972f39 fix coverity resource leak 2023-10-15 17:49:48 +02:00
iceman1001 ade322a410 style 2023-10-15 17:14:56 +02:00
iceman1001 12fc664870 updated commands and text 2023-10-15 17:11:36 +02:00
iceman1001 8a9c043aa6 fixing "lf hid clone --bin" param to correctly handle sentinel bit 2023-10-15 15:23:14 +02:00
iceman1001 026cd7d53d style 2023-10-15 13:21:16 +02:00
iceman1001 0442e04e05 text 2023-10-15 13:19:33 +02:00
Iceman ac25c9d47a
Merge pull request #2129 from Antiklesys/master 
Fixed iclass offline mode commands
 2023-10-15 12:39:49 +02:00
Antiklesys 22b85c74d8 Fixed iclass info available in offline mode 
Fixed iclass info available in offline mode
 2023-10-15 18:27:25 +08:00
iceman1001 a348d58c6d support fct 2023-10-15 11:24:48 +02:00
Antiklesys 90ac7fb67b Fixed iclass offline mode commands 
Fixed iclass offline mode commands
 2023-10-15 13:59:38 +08:00
iceman1001 fc6feea0d4 experimental UDP support. Doesnt quite work yet 2023-10-14 20:30:13 +02:00
iceman1001 0490dc9d07 use strstr instead of memcmp 2023-10-14 11:00:15 +02:00
Iceman 80ac7972fd
Merge branch 'master' into master 
Signed-off-by: Iceman <iceman@iuse.se>
 2023-10-14 09:52:55 +02:00
Self Not Found f90434521e
Reduce latency in local TCP connection 2023-10-14 14:16:30 +08:00
iceman1001 6e1cf6c0de added a C sample of grabbing output 2023-10-13 22:51:12 +02:00
Antiklesys 28c4f66c0b Update cmdhficlass.c 2023-10-13 22:53:29 +08:00
Antiklesys 0692af8425 Update cmdhficlass.c 
Reverted changes as otherwise the check is ignored.
 2023-10-13 22:22:10 +08:00
Antiklesys 7b4af95a40 Update cmdhficlass.c 2023-10-13 22:16:10 +08:00
Antiklesys e4f373dd65 Finished configcard implementation for keyroll cards 
Finalized implementation of configcard generation for keyroll when cardhelper is not present.
Results need to be compared with cardhelper output.
 2023-10-13 21:54:07 +08:00
Iceman 449eacdee5
Merge pull request #2125 from Antiklesys/master 
Ported configcard from nfc-iclass
 2023-10-13 11:34:31 +02:00
iceman1001 8a8288ec25 fix the doubletts.. 2023-10-13 08:40:54 +02:00
iceman1001 168b9eea7a Bandai Namco Passport [fka Banapassport] / Sega Aime Card. 
BNPs / Aimes endorsed with the Amusement IC Logo use FeliCa and will not work with the below keys.
Dumped on the Flipper Devices Discord Server
 2023-10-13 08:23:20 +02:00
Antiklesys ef9b57748a Ported configcard from nfc-iclass 
Enabled creation of configcards without cardhelper using nfc-iclass data
 2023-10-13 00:29:40 +08:00
iceman1001 0ff41fa652 style 2023-10-12 14:53:26 +02:00
iceman1001 3a1a09ef63 adapt to be online mode only 2023-10-12 09:37:44 +02:00
iceman1001 82294d71f6 making sure apdu logging is turned off after command execution. Still some commands when failing, hasnt been adapted to it. 2023-10-11 12:43:58 +02:00
iceman1001 29712bfde6 text 2023-10-10 19:49:27 +02:00
iceman1001 8625fc3283 maur 2023-10-10 19:47:35 +02:00
iceman1001 7cec258349 minor adjustments to texts 2023-10-09 20:09:22 +02:00
iceman1001 6229021f07 use the ISO7816 defines we already have 2023-10-09 15:24:57 +02:00
iceman1001 7b3e84c0d6 better fix for the PAGEMAP issue 2023-10-09 15:14:53 +02:00
iceman1001 d41f0c394e hf iclass wrbl - the pagemap bit maps isnt the best to handle all four cases. This atleast fixes one issue with them 2023-10-09 15:04:49 +02:00
iceman1001 3d9d8253a6 maur 2023-10-07 12:20:51 +02:00
Adam Jon Foster 3243414c20
Update mfc_default_keys.dic 
Added Keys found on old cards plus notes on another key sighting

Signed-off-by: Adam Jon Foster <me@evildaemond.com>
 2023-10-05 17:37:29 +08:00
nvx c1c512f325 Changed hf iclass view/decrypt to detect SIO lengths better and show if legacy credentials are encrypted 2023-10-04 18:40:58 +10:00
iceman1001 4f96d3eb46 style 2023-10-03 17:10:39 +02:00
iceman1001 dee03b414c fix some coverity 2023-10-02 21:47:35 +02:00
iceman1001 010668ebb1 clean up 2023-10-02 21:39:15 +02:00
iceman1001 e94a653038 missing return 2023-10-02 21:04:21 +02:00
iceman1001 115e85e5d4 missing defines 2023-10-02 21:01:08 +02:00
iceman1001 89db5d3875 text 2023-10-02 20:59:01 +02:00
iceman1001 fb23d2047f reworked the JSON format for 14a, 14b, 15, cryptorf, lto, NDEF.\nDeprecated EML format. Pm3 client do not save EML files any more.nPm3 client will continue to load EML files. 2023-10-02 20:11:23 +02:00
iceman1001 bb5d61dca7 added some helper functions 2023-10-01 13:05:08 +02:00
iceman1001 7320f0dd16 thanks @gentilkiwi for pointing it out 2023-09-29 21:41:27 +02:00
iceman1001 278a179308 fixed sim fw 2023-09-29 20:50:39 +02:00
iceman1001 59d67b3606 fix newline in output 2023-09-28 08:54:32 +02:00
iceman1001 1234b08132 adapt to new sim module firmware version 2023-09-28 08:46:04 +02:00
iceman1001 f9f42337c3 Sim Module FW4.42 build from GentilKiwis C impl. 2023-09-28 08:35:48 +02:00
iceman1001 44fe3ec38f smart raw --timeout parameter 2023-09-27 22:09:01 +02:00
iceman1001 b0ec0ee60b maur 2023-09-19 16:36:39 +02:00
iceman1001 b6e1344e1c added a custom timeout parameter to the smart raw command 2023-09-16 18:38:53 +02:00
iceman1001 3ff659fd98 fix newline issue 2023-09-16 09:31:42 +02:00
iceman1001 ec0d27685c adapt script to handle SE SAM again 2023-09-16 09:22:45 +02:00
iceman1001 d7f306084a colors for kiwi 2023-09-15 21:48:57 +02:00
iceman1001 ce76e4e351 update ATR list 2023-09-15 21:44:02 +02:00
iceman1001 25ab507137 length var is set in the preamble check... 2023-09-14 05:15:38 +02:00
iceman1001 ddfbd7f549 allow for t55xx detection to search for 0xE039 (Silicon Craft technology) 2023-09-13 21:12:09 +02:00
Grayson Martin 7f91da8a9a
Merge branch 'master' into smartcard-relay 2023-09-12 22:30:59 -05:00
spandox2 5baba1fd43
Update cmdhfmf.c 
Signed-off-by: spandox2 <31641448+spandox2@users.noreply.github.com>
 2023-09-11 13:48:09 -04:00