Commit graph

13611 commits

Author SHA1 Message Date
merlokk 7cb089f11b 350861 2021-07-12 11:19:48 +03:00
merlokk a3acb921c7 350563 2021-07-12 11:18:55 +03:00
merlokk a0ec56cdc4 350557 2021-07-12 11:15:50 +03:00
Iceman 1138f2b7ec
Merge pull request #1365 from scott4290/master
Update flash.c
2021-07-11 22:30:13 +02:00
scott4290 33b48ae205
Update flash.c
Adding a suggested step to point the user in the right direction.

[+] Loading usable ELF segments:
[+]    0: V 0x00102000 P 0x00102000 (0x00040888->0x00040888) [R X] @0x94
[!!] 🚨 Error: PHDR is not contained in Flash
[!!] 🚨 Firmware probably too big for your device
[=] The flashing procedure failed, follow the suggested steps!
[+] All done
2021-07-11 16:17:51 -04:00
Oleg Moiseenko 1d883db517
Merge pull request #1364 from merlokk/desfire5
Desfire GetKeySettings and ChangeKeySettings
2021-07-11 19:45:00 +03:00
merlokk 88e573d072 add default channel settings to commands 2021-07-11 18:58:26 +03:00
merlokk e4bdecf30e style 2021-07-11 18:57:44 +03:00
merlokk cc3883a770 ev1/enc tx side works 2021-07-11 18:27:29 +03:00
merlokk d8a8c015bc channel d40/encode works 2021-07-11 18:14:27 +03:00
merlokk 3f7f343f6f DesfireChangeKeySettings works 2021-07-10 16:11:44 +03:00
merlokk 5367cb4e23 CmdHF14ADesChKeySettings command 2021-07-10 16:05:40 +03:00
merlokk 1cd467e1f3 change param name 2021-07-10 15:16:06 +03:00
merlokk e54f0e3a33 move crc to new file 2021-07-10 15:10:15 +03:00
merlokk b6e6070bfe remove debug 2021-07-10 15:08:39 +03:00
merlokk 67d7d29d74 CmdHF14ADesGetKeySettings works 2021-07-10 15:07:51 +03:00
Iceman a609733dd7
Update README.md
text
2021-07-10 12:06:52 +02:00
iceman1001 6fdb5f190b text 2021-07-10 09:31:53 +02:00
iceman1001 e375d10eb2 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2021-07-10 08:37:25 +02:00
iceman1001 13892a31f1 text 2021-07-10 08:29:42 +02:00
Iceman 851833aff0
Merge pull request #1362 from scott4290/master
Update cmdlft55xx.c
2021-07-10 08:28:37 +02:00
scott4290 3634fb4091
Update cmdlft55xx.c
Fixed two bugs:  >= preventing users from testing one password (start_password=end_password) and reporting that the start password is greater than the end password.  The second issue is when the end password _is_ the correct password, the found password reported was curr -1.
2021-07-10 00:00:42 -04:00
iceman1001 ed5945d382 textual 2021-07-09 19:15:37 +02:00
iceman1001 200a08e091 text 2021-07-09 19:06:45 +02:00
iceman1001 0b13efc9a0 text 2021-07-09 19:05:46 +02:00
iceman1001 d4ff3e802f text 2021-07-09 19:04:53 +02:00
iceman1001 eadf5882d8 text 2021-07-09 19:03:54 +02:00
merlokk c8777ebea8 add getkeysettings command 2021-07-09 19:26:41 +03:00
merlokk cbffdd7552 add print keysettings 2021-07-09 19:26:15 +03:00
iceman1001 23bcc7515a allow some tests to run also under --long 2021-07-09 17:51:08 +02:00
merlokk d67ea92e2e implement check channel, add 2 new commands 2021-07-09 18:04:27 +03:00
merlokk f606cc5fb5 added check channel 2021-07-09 18:03:34 +03:00
Oleg Moiseenko da9fff22c9
Merge pull request #1361 from merlokk/desfire_tests
add test command for desfire
2021-07-09 16:38:29 +03:00
merlokk aa1d98ba55 fix test AlwaysAvailable 2021-07-09 16:06:18 +03:00
merlokk 65b92e0352 add tests to CI 2021-07-09 15:59:45 +03:00
merlokk 48a9636679 style 2021-07-09 15:56:18 +03:00
merlokk 8403624bb1 cmac tests 2021-07-09 15:50:40 +03:00
merlokk fff1c8fae1 add test command and crc tests 2021-07-09 15:15:16 +03:00
Oleg Moiseenko 5ffe1367f4
Merge pull request #1360 from merlokk/makestyle
make style
2021-07-09 14:58:45 +03:00
merlokk 370c4cf5a4 make style 2021-07-09 14:43:12 +03:00
Oleg Moiseenko 60d132fcc0
Merge pull request #1359 from merlokk/desfire4
Desfire encoded channel for d40/ev1
2021-07-09 14:35:58 +03:00
Iceman 50264dcbf1
Update 0_Compilation-Instructions.md
`make -j`  is the preferred way.
2021-07-09 13:14:02 +02:00
merlokk 08d8ac4f9f fix bug with false-positive crc16 and remove debug 2021-07-09 14:01:57 +03:00
merlokk 77a66a024b remove debug 2021-07-09 14:01:22 +03:00
merlokk bed25108f6 d40/enc works 2021-07-09 13:14:42 +03:00
merlokk a7f39a1b79 move crc search function to desfirecrypto 2021-07-09 13:09:59 +03:00
merlokk ec79e35dcc add crc16 check 2021-07-09 13:08:49 +03:00
merlokk 70bedbd7d1 fix some d40 channel conditions 2021-07-09 01:41:25 +03:00
merlokk 2fde5d90ae crc32 ok, ev1/enc channel ok. 2021-07-09 01:27:28 +03:00
merlokk 0fa708acb2 add crc32 check 2021-07-09 01:26:47 +03:00