merlokk
a3acb921c7
350563
2021-07-12 11:18:55 +03:00
merlokk
a0ec56cdc4
350557
2021-07-12 11:15:50 +03: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
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
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
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
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
merlokk
370c4cf5a4
make style
2021-07-09 14:43:12 +03: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
merlokk
cf7949c1f8
fix chaining
2021-07-08 18:26:07 +03:00
merlokk
03ed6a8f05
Merge branch 'master' of https://github.com/merlokk/proxmark3i into desfire4
...
# Conflicts:
# client/src/mifare/desfiresecurechan.c
2021-07-08 17:46:06 +03:00
merlokk
8fd896478e
ev1 channel reorganized
2021-07-08 17:07:02 +03:00
merlokk
567cbadc58
add some session params
2021-07-08 17:04:44 +03:00
Philippe Teuwen
3c31ee793d
make style
2021-07-08 09:53:50 +02:00
merlokk
ebcb86570e
fix length bug in the encode/decode
2021-07-07 18:41:20 +03:00
merlokk
ca983f1473
cmac can be NULL
2021-07-07 18:06:38 +03:00
merlokk
c99002c5e0
add Get UID command
2021-07-07 17:59:42 +03:00
merlokk
6e207be3ac
added there is no applications
message if it there is no app)
2021-07-07 16:31:23 +03:00
merlokk
d963ec8332
remove debug
2021-07-07 16:25:26 +03:00
merlokk
8102891491
ev1/mac and ev1/plain works
2021-07-07 16:18:12 +03:00
merlokk
0f0ef4435e
add mac length and fix encode/decode
2021-07-07 16:17:35 +03:00
merlokk
857ce0ea17
fix multiple sprint_hex
2021-07-07 16:16:45 +03:00
merlokk
ae53e38335
add application create/delete commands
2021-07-06 18:41:52 +03:00
merlokk
fffef000ea
mac des/ev1 calculated
2021-07-06 16:46:05 +03:00
merlokk
5f0f6b8032
update crypto encode/decode
2021-07-06 16:22:01 +03:00
merlokk
c22050b638
create new desfirecrypto
2021-07-06 12:39:06 +03:00
Oleg Moiseenko
a20db915df
Merge branch 'master' into desf_update2
2021-07-06 12:17:31 +03:00
merlokk
20696fb44a
make style
2021-07-06 12:16:19 +03:00
merlokk
0a51eb445d
add mac sketch
2021-07-06 12:05:59 +03:00
merlokk
56d7efdbb5
move some functions from cipurse to libcrypto
2021-07-06 12:05:38 +03:00
scott4290
c5faa57833
Update t55xx_default_pwds.dic
...
ID/HID blue copier with a light-blue inlay sticker purchased circa 2014. I tested with two different T5577 codes and the same password was set.
2021-07-05 17:27:05 -04:00
iceman1001
918630e22e
fixes closing picture viewer exits client
2021-07-05 19:09:16 +02:00
merlokk
d2491d342d
move secure channel functions to separate file
2021-07-05 19:31:42 +03:00
merlokk
b63a991bc3
fix coverity 350561
2021-07-05 19:04:41 +03:00
merlokk
7882a2dbaa
fix coverity 350557
2021-07-05 19:03:41 +03:00
iceman1001
36af584e1b
fix CID 350569
2021-07-05 17:23:02 +02:00
iceman1001
b0c1ce714f
fix coverity CID 350569
2021-07-05 17:14:47 +02:00
iceman1001
b026fc64f0
fix coverity CID 350152
2021-07-05 17:14:14 +02:00
merlokk
84eb4e4597
try to fix coverity
2021-07-05 15:35:53 +03:00
merlokk
be9db18852
fix coverity 350572
2021-07-05 15:22:33 +03:00
Oleg Moiseenko
8a598ce33c
Merge pull request #1346 from merlokk/desf_update
...
Desfire functionality update
2021-07-05 14:50:19 +03:00
iceman1001
cfb6e98a8e
forgot to push some android adaptions
2021-07-05 13:45:45 +02:00
iceman1001
20fe52f8eb
added a picture viewer in QT to be used with hf emrtd
2021-07-05 13:42:33 +02:00
merlokk
d6dc117ed3
mark commands with new
sign
2021-07-05 14:18:05 +03:00
merlokk
164a1db780
Merge branch 'desf_update' of https://github.com/merlokk/proxmark3i into desf_update
2021-07-05 14:15:58 +03:00
merlokk
e9b8e18430
remove key_size
2021-07-05 14:15:39 +03:00
Oleg Moiseenko
6671563fb9
Merge branch 'master' into desf_update
2021-07-05 14:02:15 +03:00
merlokk
96d18a1cd7
splitbysize works correctly in the all the cases
2021-07-05 14:00:51 +03:00
iceman1001
36c0ddc91a
increase output size in order to avoid crash in emrtd info
2021-07-05 12:36:43 +02:00
merlokk
003a0b0de4
splitbysize now put length of message at the first bytes of array's memory
2021-07-05 12:40:07 +03:00
Oleg Moiseenko
dfc151d2ac
Merge branch 'master' into crypto_changes
2021-07-05 12:26:43 +03:00
merlokk
5937fd4217
added lib
2021-07-05 12:12:42 +03:00
merlokk
dece2b1bbd
delete des from desfire_crypto
2021-07-05 12:09:08 +03:00
merlokk
3cc199ea34
cmdhfmf uses libcrypto
2021-07-05 12:04:36 +03:00
merlokk
93a19fb953
cmdhfemrtd uses libcrypto
2021-07-05 12:03:50 +03:00
merlokk
2fb090e560
move des functions to pcrypto
2021-07-05 12:01:43 +03:00
merlokk
afbd80b906
cliparser CLIGetOptionList
2021-07-05 11:59:07 +03:00
merlokk
b53c8bc0c9
Merge branch 'master' of github.com:merlokk/proxmark3i into desf_update
2021-07-04 22:40:27 +03:00
merlokk
1aedfc7b6e
ev1 mac decode placeholder
2021-07-04 22:37:27 +03:00
merlokk
5d8fa054e5
added channel logic to d40 mode
2021-07-04 22:16:43 +03:00
merlokk
998538a60a
libcrypto des encrypt/decrypt ecb and change cmdhfemtrd to use des from libcrypto
2021-07-04 22:15:53 +03:00
merlokk
aa8c4b3dca
secure channel sketch
2021-07-04 17:49:11 +03:00
merlokk
fce8affd48
fix des authentication
2021-07-04 15:43:57 +03:00
merlokk
1adfad07bd
move des encrypt/decrypt to lib
2021-07-04 14:14:43 +03:00
merlokk
db87af3bf8
Revert "fix DesfireAuthenticate for d40/ev1 mode"
...
This reverts commit 430f82730d
.
2021-07-04 14:00:35 +03:00
merlokk
430f82730d
fix DesfireAuthenticate for d40/ev1 mode
2021-07-04 13:38:12 +03:00
Iceman
afb06ec72c
Merge pull request #1347 from linuxgemini/macports-support-experiment
...
add experimental support for macs with macports installed
2021-07-04 12:10:45 +02:00
merlokk
6124b49c99
DesfirePrintContext prints session state
2021-07-04 12:47:09 +03:00
merlokk
5271cb96c3
add commant, remove debug
2021-07-04 12:25:34 +03:00
merlokk
2abd930ef7
simplify cliparser optinlist. added mfdes default
2021-07-04 12:20:09 +03:00
merlokk
fe5f9ec9d5
native channel works
2021-07-04 11:21:31 +03:00
Pat Cunningham
2b176c53cc
handel incorrect picopass config found on unpersonalized cards and AA1s grater than 250 blocks
2021-07-03 20:22:42 -07:00
merlokk
1b2442ec36
regactoring desfire commands. textual fixes
2021-07-03 17:31:12 +03:00
İlteriş Yağıztegin Eroğlu
24a2a94341
add experimental support for macs with macports installed
...
currently requires symlinking python{version}(-embed).pc to
python(embed).pc or python3(-embed).pc
under /opt/local/lib/pkgconfig
2021-07-03 17:07:53 +03:00
merlokk
0d00f56777
CmdHF14ADesGetAppNames works
2021-07-03 13:11:17 +03:00
merlokk
f9e006f2e3
added authchann otion
2021-07-03 12:21:29 +03:00
merlokk
acca624752
added cli text options to command
2021-07-03 00:08:45 +03:00
merlokk
7af924eadd
add get key size function
2021-07-03 00:07:55 +03:00
merlokk
850e36ab31
cli parser text options
2021-07-03 00:07:21 +03:00
merlokk
a73c6ef90a
add array_length
2021-07-02 22:13:45 +03:00
merlokk
0aad993711
remove comments and text fixes
2021-07-02 18:17:21 +03:00
merlokk
d354ac90fd
fix warning
2021-07-02 18:07:46 +03:00
merlokk
636a1dd457
DesfireGetAIDList works
2021-07-02 18:06:13 +03:00
merlokk
e5d24ff81f
authentication works
2021-07-02 17:37:15 +03:00
Philippe Teuwen
732644fb9b
hf_mfu_magicwrite -c: add version info
2021-07-01 22:00:57 +02:00
merlokk
b5ee999c73
rename GetErrorString -> DesfireGetErrorString
2021-07-01 20:47:02 +03:00
merlokk
73db86bcc7
exchange returns result. select works
2021-07-01 20:32:04 +03:00
merlokk
ecfcc21ded
select works (somehow)
2021-07-01 20:06:33 +03:00
merlokk
2fa6c4643e
desfire channel sketch
2021-07-01 19:53:57 +03:00
merlokk
d43f6ffc44
make style
2021-06-30 12:32:52 +03:00
merlokk
9c65dacb50
added clear parameter
2021-06-30 12:26:08 +03:00
merlokk
97f3a972d4
added default parameters for hf cipurse
. now not needs to enter them each time
2021-06-30 12:19:12 +03:00
iceman1001
d6e55a2f40
textual
2021-06-29 22:23:39 +02:00
merlokk
9487953359
asn1_value_integer now works in pure hex to int instead of BCD
2021-06-29 19:59:42 +03:00
Nemanja Nedeljković
adb207268d
Change in hf 15 raw broke support hf_15_magic.lua
...
There was a change in `hf 15 raw` and this script was not updated to support that change
2021-06-29 12:52:35 +02:00
Philippe Teuwen
6f579e5b6c
mfkeys
2021-06-29 01:57:04 +02:00
iceman1001
f0c1665427
Revert "Release v4.13441 - midsummer"
...
This reverts commit 55e1b6714b
.
2021-06-25 23:39:10 +02:00
iceman1001
55e1b6714b
Release v4.13441 - midsummer
2021-06-25 23:39:10 +02:00
iceman1001
a115ff0757
style
2021-06-25 23:35:36 +02:00
iceman1001
589c304142
fix uninitialized gcc7.5 opensuse warning
2021-06-25 23:09:48 +02:00
iceman1001
93cc64a8e3
fix uninitialized gcc7.5 opensuse warning
2021-06-25 23:04:55 +02:00
iceman1001
94d12f8bbf
fix coverity CID 350102
2021-06-25 22:43:54 +02:00
iceman1001
015e02a9bf
free start pointer
2021-06-25 22:13:41 +02:00
iceman1001
26b37ce64f
reworked "lf em 4x50 chk" to use dynamic memory for dictionary
2021-06-25 19:46:12 +02:00
iceman1001
a10c92267e
allow for 24 bytes keys to be loaded from dictionary
2021-06-25 19:45:25 +02:00
iceman1001
a86bd9464f
text
2021-06-25 17:22:09 +02:00
rioux
f7c4336645
last update askip
2021-06-25 13:26:16 +02:00
rioux
c5aaa3f83f
lf nexwatch with psk2
2021-06-25 12:09:40 +02:00
rioux
e33f2a76aa
lf nexwatch with psk2
2021-06-25 12:00:29 +02:00
Guilhem7
9b63675e05
Merge branch 'RfidResearchGroup:master' into master
2021-06-25 11:50:06 +02:00
iceman1001
4b2ab94b26
hw setmux - improved user feedback
2021-06-25 10:34:12 +02:00
iceman1001
b1e361619f
fix shadow
2021-06-25 10:04:29 +02:00
iceman1001
0747abfe0f
lf em 4x05 brute/chk - fixes input arguments, unify file name text
2021-06-25 10:03:14 +02:00
iceman1001
fc822109de
unifiy file name param / textual
2021-06-25 10:02:30 +02:00
MaximeBosca
5f9f623627
new clone
2021-06-25 09:56:30 +02:00
iceman1001
d7421369ad
text
2021-06-25 09:43:39 +02:00
iceman1001
3d663be25a
fix "lf hitag reader --23" - now allows 6bytes
2021-06-24 21:31:43 +02:00
iceman1001
3b9da365a0
textual
2021-06-24 19:27:12 +02:00
Iceman
270ef78820
Merge pull request #1337 from merlokk/cov305864
...
fix coverity 305864
2021-06-24 18:47:51 +02:00
iceman1001
e2ca0a4abd
style
2021-06-24 18:47:11 +02:00
merlokk
791a4e885b
fix coverity 305864
2021-06-24 19:29:36 +03:00
iceman1001
eed0ca4796
textual
2021-06-24 18:23:10 +02:00
Iceman
cffd0068fd
Merge pull request #1334 from merlokk/cipurse_test
...
Cipurse tests
2021-06-24 17:41:11 +02:00
iceman1001
ebd9f24af4
fix hf iclass config - now uses a default config card data if no config card present on device.
2021-06-24 17:38:17 +02:00
iceman1001
f02daaa1cb
ndef parser vcard now handles xvcard
2021-06-24 17:34:37 +02:00
rad1game
a4643516f8
Update cmdlfem4x05.c
...
Typo fix
2021-06-24 19:05:35 +04:00