Commit Graph

  • d0c1492a46 textual changes, UID/ID -> EM Tag ID. Clarify number of hex symbols in error msg, thanks @clach04 iceman1001 2021-08-08 15:24:31 +02:00
  • 4c54d09894
    Merge pull request #1435 from AxisRay/fix-cmd-error Iceman 2021-08-08 15:08:14 +02:00
  • 346db39b48 tripple question marks annoys c compiler iceman1001 2021-08-08 15:06:55 +02:00
  • 5e1cfa56c0 bugfix: hf mfu dump not working Ray Lee 2021-08-08 20:34:36 +08:00
  • ef916ee437
    Merge pull request #1434 from ah01/add-suica-ic-type Iceman 2021-08-08 13:51:14 +02:00
  • 5f561de4cb
    Add Suica card IC Type Adam Hořčica 2021-08-08 13:34:42 +02:00
  • 886e93d106
    Merge pull request #1433 from AxisRay/new-standalone-mode Iceman 2021-08-08 10:40:52 +02:00
  • e1b6e342d9 follow alphabetic order Ray Lee 2021-08-08 16:11:57 +08:00
  • 77116b3952 update Changelog and document Ray Lee 2021-08-08 15:12:22 +08:00
  • f317fc38f5 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 into new-standalone-mode Ray Lee 2021-08-08 14:58:29 +08:00
  • 94bb6d389b add source merlokk 2021-08-07 22:07:24 +03:00
  • 2fb3385d90 test subkeys - 2tdea, 3tdea merlokk 2021-08-07 22:03:48 +03:00
  • 4a2a23c6e2 kdf an10922 test merlokk 2021-08-07 20:26:49 +03:00
  • 6fae3b7b0e add new standalone mode MFCSIM Ray Lee 2021-08-07 22:19:08 +08:00
  • 7aad008762 fix key path for cmac subkeys merlokk 2021-08-07 16:27:39 +03:00
  • 02194f3e43 aes cmac subkeys test merlokk 2021-08-07 16:16:41 +03:00
  • 7ea7e4b364 fix merlokk 2021-08-07 14:53:23 +03:00
  • ce39985d19 remove debug merlokk 2021-08-07 13:57:50 +03:00
  • 88756eef79 auth concet merlokk 2021-08-07 13:54:43 +03:00
  • efd3a887ae remove some old cryto code merlokk 2021-08-07 13:42:47 +03:00
  • e21010905c add crytolib merlokk 2021-08-07 12:54:59 +03:00
  • ee7438bfc1 move functions, get rid of some deendences merlokk 2021-08-07 12:20:05 +03:00
  • 9b999b7d2c remove old session key gen merlokk 2021-08-07 11:53:34 +03:00
  • 84f470a596 remove subkey gen merlokk 2021-08-07 11:45:09 +03:00
  • b957ebed93
    Merge branch 'RfidResearchGroup:master' into master Ray Lee 2021-08-07 12:00:43 +08:00
  • c162aadeec
    Merge pull request #1431 from merlokk/mst Oleg Moiseenko 2021-08-06 23:52:28 +03:00
  • e822cf5b1e make style merlokk 2021-08-06 23:45:53 +03:00
  • 86d8c5ff42
    Merge pull request #1428 from craftbyte/master Oleg Moiseenko 2021-08-06 23:34:33 +03:00
  • e176993097
    Merge pull request #1429 from merlokk/desf_iso Oleg Moiseenko 2021-08-06 23:20:43 +03:00
  • ac7be1c4f4 remove todo merlokk 2021-08-06 23:10:40 +03:00
  • 53874fcd24 add help merlokk 2021-08-06 23:09:27 +03:00
  • 39be125df3 write binary works merlokk 2021-08-06 21:38:13 +03:00
  • 6c3cac9c63 fix buffer length merlokk 2021-08-06 20:31:12 +03:00
  • d92c8f1bff iso mac calculation merlokk 2021-08-06 20:27:04 +03:00
  • 0d551b3940 todo merlokk 2021-08-06 20:03:49 +03:00
  • 1b6531f50e text fix merlokk 2021-08-06 20:02:49 +03:00
  • 130ab34ab6 read record merlokk 2021-08-06 20:01:13 +03:00
  • 92cb18e7d2 read binary works merlokk 2021-08-06 19:47:12 +03:00
  • d7aa4feae8 iso select rework merlokk 2021-08-06 19:46:49 +03:00
  • 3ac294e0c4
    Merge pull request #1430 from AxisRay/new-tag Iceman 2021-08-06 18:10:04 +02:00
  • 67bfeeed3a add support for Shanghai Feiju NTAG213 Ray Lee 2021-08-06 22:32:45 +08:00
  • b2ebbf3ed0 fix. remove todo) merlokk 2021-08-06 14:56:10 +03:00
  • 409fb65a3f add iso to read command and read bin file merlokk 2021-08-06 14:52:58 +03:00
  • c27100295a fix iso command data merlokk 2021-08-06 14:52:33 +03:00
  • 46c9b06538
    Merge pull request #1423 from AxisRay/ui-improve Philippe Teuwen 2021-08-06 08:35:02 +02:00
  • 7c921c1e6e De-redundancy Ray Lee 2021-08-06 11:13:15 +08:00
  • 18e2d55c57 remove debug & cov 354623 ) merlokk 2021-08-05 20:26:27 +03:00
  • f1c48db6bd added iso commands and read sketch merlokk 2021-08-05 20:03:07 +03:00
  • 51d3618d24
    Merge branch 'RfidResearchGroup:master' into master Anže Jenšterle 2021-08-05 18:53:58 +02:00
  • c71f93687d
    Fix DESfire DF search and assignment to AID Anze Jensterle 2021-08-05 18:45:50 +02:00
  • 3945e1e7f4 added iso channel checks merlokk 2021-08-05 19:06:53 +03:00
  • 3609f8fb36
    Merge pull request #1427 from merlokk/hlp Oleg Moiseenko 2021-08-05 18:38:55 +03:00
  • 7a6766a2a3 setconfig help merlokk 2021-08-05 18:38:32 +03:00
  • ffacafb96e
    Merge pull request #1425 from craftbyte/patch-3 Iceman 2021-08-05 17:06:52 +02:00
  • d74b9f8cbe
    fix json Anže Jenšterle 2021-08-05 15:51:35 +02:00
  • 4f33d201a9
    Added LEAF identity MAD entry Anže Jenšterle 2021-08-05 15:47:32 +02:00
  • f0faa1d84c
    Merge pull request #1424 from merlokk/desf_chkey_ev2 Oleg Moiseenko 2021-08-05 12:40:34 +03:00
  • 6e5240056e changekey ev2 works merlokk 2021-08-05 12:32:08 +03:00
  • 457483eafe ui improve Ray Lee 2021-08-05 11:03:30 +08:00
  • 8d02593e0d make style Ray Lee 2021-08-05 09:19:08 +08:00
  • 056e799320 removed extra modification Ray Lee 2021-08-05 09:16:23 +08:00
  • bb62550b0d
    Merge pull request #1422 from merlokk/ms Oleg Moiseenko 2021-08-05 00:02:39 +03:00
  • 09bb3f62a1 make style merlokk 2021-08-05 00:01:53 +03:00
  • a6d8b2edee
    Merge pull request #1420 from merlokk/desf_setconf Oleg Moiseenko 2021-08-04 23:54:59 +03:00
  • 91b1026f6d remove comments merlokk 2021-08-04 23:51:09 +03:00
  • 2432908e08 ev2 enc with padding - ok merlokk 2021-08-04 23:39:25 +03:00
  • 8c140a8912
    Merge pull request #1418 from RfidResearchGroup/electra Philippe Teuwen 2021-08-04 22:32:16 +02:00
  • 7046675403 d40 fix merlokk 2021-08-04 23:13:57 +03:00
  • c125c10e31 d40 + padding merlokk 2021-08-04 22:36:38 +03:00
  • e78c563e45 encode with padding sketch merlokk 2021-08-04 20:01:11 +03:00
  • d847aed5a6
    Merge pull request #1419 from merlokk/desf_ev2 Oleg Moiseenko 2021-08-04 19:44:56 +03:00
  • 6388384393 cov 354477 merlokk 2021-08-04 19:41:04 +03:00
  • d992ce73c3 re-added the old checksum bits but guarded them as debug prints iceman1001 2021-08-04 18:25:23 +02:00
  • 7e8ffc3e0c string formatter iceman1001 2021-08-04 18:17:16 +02:00
  • 7b79bd375f move plain mode to mac mode merlokk 2021-08-04 19:12:44 +03:00
  • df0d5617ac ev2 plain comes wo mac merlokk 2021-08-04 18:49:36 +03:00
  • 9478305436 d40 mac calc merlokk 2021-08-04 18:46:05 +03:00
  • 450ec87296 add ev1 mac with and wo data merlokk 2021-08-04 18:07:04 +03:00
  • be9093db63 fix match iso id and iso file id merlokk 2021-08-04 18:06:23 +03:00
  • a6e39a5ff1 ev2/encoded works with/wo data on the all directions merlokk 2021-08-04 17:15:32 +03:00
  • c3a5a45d37 add rx mac print if OK merlokk 2021-08-04 16:42:39 +03:00
  • bf59d29919 ch ev2/encode tx no data, rx with data works (getuid) merlokk 2021-08-04 16:38:10 +03:00
  • ee22a824ce Add support for Electra demodulation Philippe Teuwen 2021-08-03 23:22:19 +02:00
  • 3c34e95ce9
    Merge pull request #1417 from merlokk/getui Oleg Moiseenko 2021-08-04 16:04:28 +03:00
  • 5abf00b2b8 get uid command merlokk 2021-08-04 16:04:05 +03:00
  • a1ca96bcb6
    Merge pull request #1416 from merlokk/makestyle Oleg Moiseenko 2021-08-04 16:02:23 +03:00
  • 3baf595578 make style merlokk 2021-08-04 15:48:20 +03:00
  • 45073eb969
    Merge pull request #1415 from merlokk/ev2mac Oleg Moiseenko 2021-08-04 15:30:18 +03:00
  • 51b197c3a6 ev2 encrypted channel tx works merlokk 2021-08-04 15:26:40 +03:00
  • fc8e3e8851 fix ev2 auth. ev2/enc/nodata works merlokk 2021-08-04 14:58:07 +03:00
  • c1d1ed5b61
    Merge pull request #1414 from merlokk/changekey_samples Oleg Moiseenko 2021-08-04 12:06:29 +03:00
  • 5046eb22a6
    Merge pull request #1413 from merlokk/desf_select Oleg Moiseenko 2021-08-04 12:06:15 +03:00
  • b34681b484
    Merge pull request #1410 from merlokk/desf_ls Oleg Moiseenko 2021-08-04 12:05:55 +03:00
  • 645985a1f9 check mode in ev2 like ev1 merlokk 2021-08-03 19:08:30 +03:00
  • fd5afbdfac encode fix merlokk 2021-08-03 18:58:39 +03:00
  • 8d84e96716 ev2 rx channel sketch merlokk 2021-08-03 18:49:52 +03:00
  • 58e8693b49 ev2 tx channel sketch merlokk 2021-08-03 18:33:06 +03:00
  • 22c2b46010 add tests merlokk 2021-08-03 18:03:17 +03:00
  • fa30947698 mac calc merlokk 2021-08-03 17:55:28 +03:00
  • e7414e127d test merlokk 2021-08-03 17:41:55 +03:00