Commit graph

14226 commits

Author SHA1 Message Date
merlokk d939d025b0 fix 2021-08-09 15:44:13 +03:00
Oleg Moiseenko c614565cbe
Merge branch 'master' into hex_cli 2021-08-09 15:39:08 +03:00
merlokk 530c0d7336 part 2 2021-08-09 15:36:31 +03:00
merlokk 1865b60374 part 1 2021-08-09 15:19:31 +03:00
merlokk f50b98ece5 isoid 2021-08-09 15:12:07 +03:00
merlokk 282ea59cc6 file id 2021-08-09 15:05:44 +03:00
merlokk 33c79942c9 CmdHF14ADesValueOperations 2021-08-09 14:48:42 +03:00
merlokk 8bed10029e cli update 2021-08-09 14:46:02 +03:00
Oleg Moiseenko 081f275dda
Merge pull request #1440 from merlokk/isofix
Iso id byte order fix
2021-08-09 14:11:50 +03:00
Ray Lee 6d673b1063 fix uid 0000000 2021-08-09 18:58:47 +08:00
merlokk a06376a7f6 added file iso id to select command 2021-08-09 13:35:21 +03:00
merlokk 4e6a59f169 fix iso id byte order 2021-08-09 13:19:28 +03:00
Oleg Moiseenko 4641b22b26
Merge pull request #1439 from merlokk/cov
coverity
2021-08-09 12:01:33 +03:00
merlokk 16781248cb cov 354644 2021-08-09 12:00:55 +03:00
Oleg Moiseenko 3e59233997
Merge pull request #1437 from merlokk/14are_fix
hf 14a reader fix
2021-08-09 00:31:53 +03:00
merlokk c38109ef09 hf 14a reader fix 2021-08-09 00:31:14 +03:00
Oleg Moiseenko 6b28e020dd
Merge pull request #1436 from merlokk/mst
make style
2021-08-09 00:12:24 +03:00
merlokk 28dc6c717b make style 2021-08-09 00:12:01 +03:00
Oleg Moiseenko 1d695ef777
Merge pull request #1432 from merlokk/auth_ref
desfire authentication refactoring
2021-08-09 00:06:10 +03:00
merlokk c4d35700a1 fix some kdf parts 2021-08-08 23:48:07 +03:00
merlokk ccf31fef90 get uid for kdf 2021-08-08 23:02:45 +03:00
merlokk f9b8ef5a6d move kdf part 2021-08-08 22:42:15 +03:00
merlokk 797d878eb4 remove desfire_crypto 2021-08-08 19:31:08 +03:00
merlokk 9e3cc6826c add AID for kdf 2021-08-08 19:27:31 +03:00
merlokk 0ef41b7b78 add masterkey for kdf 2021-08-08 19:15:06 +03:00
merlokk 455b9a4e38 an10922 3tdea works 2021-08-08 18:42:54 +03:00
merlokk a86f332263 cmac 2tdea works 2021-08-08 18:33:35 +03:00
iceman1001 be2f40a663 text 2021-08-08 17:32:51 +02:00
merlokk e4a72b11e8 cmac add minimum len 2021-08-08 17:54:16 +03:00
iceman1001 9b75ecc270 style 2021-08-08 15:36:34 +02:00
iceman1001 4f43693dee text 2021-08-08 15:28:05 +02:00
iceman1001 d0c1492a46 textual changes, UID/ID -> EM Tag ID. Clarify number of hex symbols in error msg, thanks @clach04 2021-08-08 15:24:31 +02:00
Iceman 4c54d09894
Merge pull request #1435 from AxisRay/fix-cmd-error
bugfix: hf mfu dump not working
2021-08-08 15:08:14 +02:00
iceman1001 346db39b48 tripple question marks annoys c compiler 2021-08-08 15:06:55 +02:00
Ray Lee 5e1cfa56c0 bugfix: hf mfu dump not working 2021-08-08 20:34:36 +08:00
Iceman ef916ee437
Merge pull request #1434 from ah01/add-suica-ic-type
Add Suica card IC Type
2021-08-08 13:51:14 +02:00
Adam Hořčica 5f561de4cb
Add Suica card IC Type 2021-08-08 13:34:42 +02:00
Iceman 886e93d106
Merge pull request #1433 from AxisRay/new-standalone-mode
Add new standalone mode MFCSIM
2021-08-08 10:40:52 +02:00
Ray Lee e1b6e342d9 follow alphabetic order 2021-08-08 16:11:57 +08:00
Ray Lee 77116b3952 update Changelog and document 2021-08-08 15:12:22 +08:00
Ray Lee f317fc38f5 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 into new-standalone-mode 2021-08-08 14:58:29 +08:00
merlokk 94bb6d389b add source 2021-08-07 22:07:24 +03:00
merlokk 2fb3385d90 test subkeys - 2tdea, 3tdea 2021-08-07 22:03:48 +03:00
merlokk 4a2a23c6e2 kdf an10922 test 2021-08-07 20:26:49 +03:00
Ray Lee 6fae3b7b0e add new standalone mode MFCSIM 2021-08-07 22:19:08 +08:00
merlokk 7aad008762 fix key path for cmac subkeys 2021-08-07 16:27:39 +03:00
merlokk 02194f3e43 aes cmac subkeys test 2021-08-07 16:16:41 +03:00
merlokk 7ea7e4b364 fix 2021-08-07 14:53:23 +03:00
merlokk ce39985d19 remove debug 2021-08-07 13:57:50 +03:00
merlokk 88756eef79 auth concet 2021-08-07 13:54:43 +03:00