Commit Graph
11504 Commits
Author SHA1 Message Date
iceman1001 9bbdb747c8 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2024-04-03 17:07:19 +02:00
iceman1001 21f25ccd1f the data load for long file since we got the extended sniff possibility is hard to see. This commit now shows a comma printed version. It helps me :) 2024-04-03 17:05:34 +02:00
Philippe Teuwen c183894cb4 fix doc and add similar to 2024-03-27 16:41:44 +01:00
iceman1001 700d558432 move hitag2 crypto parts to the common folder in order to be able to use it on the client side. Some textual and minor adaptations across the bord 2024-03-27 09:32:00 +01:00
iceman1001 cdc46d5d2b textual and some layouts 2024-03-27 09:16:37 +01:00
iceman1001 371e7e5ebe forgot the header file 2024-03-26 15:21:15 +01:00
iceman1001 d5e33fb209 added some support functions 2024-03-26 15:13:23 +01:00
iceman1001 c66e781a9c annotation of the hitag2 protocol now properly identifies different parts without shifting of whole hex arrays. Took the idea from RFIdler (@adamLLaurie) where he treats it like a binary string instead. It works. Problem: We use whole bytes in our logging protocol and Hitag2 uses 5, 10, 32, 64 bits commands. START_AUTH is 11000, which as a MSB aligned byte is 0xC0. Now we shift it down to LSB centered and 11000 becomes 0x18. This reduces all issues with handing the rest of the array. \n\nTake note that our protocol uses whole bytes. I had to print out number of actually captured bits in the trace log now. Otherwise 65 or 71 bits would not look any different but will not work when used with other tools. This also means we abuse the logging protocol by using the parity byte arry to store number of "left over bits" in the par[0] position. 2024-03-26 15:04:39 +01:00
IcemanandGitHub 1a7b2856ef Merge pull request #2337 from craftbyte/desfire-deleteapp-fix
Fix MIFARE DESfire DeleteApp command
2024-03-21 14:13:26 +01:00
Anže Jenšterle 0cde19e7c1 Update Slovenian DESfire AIDs 2024-03-21 13:46:48 +01:00
Anže Jenšterle 9b765b488c Fix MIFARE DESfire DeleteApp command
Closes #2336
2024-03-21 13:35:26 +01:00
iceman1001 5a8917c1d0 Revert "Release v4.18341 - Zenith"
This reverts commit 70582c6828.
2024-03-20 23:31:54 +01:00
iceman1001 70582c6828 Release v4.18341 - Zenith 2024-03-20 23:31:54 +01:00
iceman1001 4367c810d0 text 2024-03-19 12:39:15 +01:00
iceman1001 51d59f1b4b more emojis 2024-03-19 12:37:18 +01:00
iceman1001 2fd36379e1 fix miscchecks 2024-03-19 11:18:33 +01:00
iceman1001 aee02cd523 style 2024-03-19 11:16:02 +01:00
iceman1001 d1d9d00d99 minor parsing issue 2024-03-19 11:11:33 +01:00
iceman1001 59bc927698 style 2024-03-16 19:56:27 +01:00
iceman1001 555fe1566f changes to hf mf info for some more detections 2024-03-16 19:04:31 +01:00
iceman1001 7c987ac636 fix - lf em 4x70 recover memset the wrong struct type 2024-03-16 18:44:11 +01:00
zhongfu 466e512cd8 feat(client/resources): updated aidlist to include CEPAS AID 2024-03-16 18:12:31 +08:00
Benjamin DELPYandGitHub eba40bfe41 Update intertic.py to support Besançon / Ginko
Signed-off-by: Benjamin DELPY <benjamin@gentilkiwi.com>
2024-03-15 19:00:26 +01:00
iceman1001 7a98427aa1 skip localization on windows 2024-03-14 14:24:20 +01:00
iceman1001 049c5f400d text 2024-03-14 13:41:20 +01:00
iceman1001 21d019ff21 language quotes 2024-03-14 13:36:58 +01:00
iceman1001 94c3bdd91c style 2024-03-14 11:26:06 +01:00
iceman1001 d99a58517d added a hf mfu wipe command. Its not doing UL-C or UL-AES key wiping. And the success for setting cfg1,cfg2,pwd,pack depends if you called the command with the current pwd that the card has. It also skips the first four blocks. UID0,1,LOCK, OTP since we dont wanna fiddle with those. This command is NOT adapted for magic card functionality 2024-03-14 10:57:25 +01:00
Henry Gabryjelski cc2bae2f4d lf em 4x70 writekey --> lf em 4x70 setkey 2024-03-13 09:38:35 -07:00
Henry Gabryjelski ba83ac065e lf em 4x70 writepin --> lf em 4x70 setpin 2024-03-13 09:25:43 -07:00
Henry Gabryjelski 7fbc6b2e47 fix formatting error 2024-03-11 18:28:47 -07:00
Henry Gabryjelski 0a598b254c make style changes 2024-03-11 17:28:05 -07:00
Henry Gabryjelski 160d61682b Add lf em 4x70 autorecover
Also:
* common.h: Increase safety of some of the macros.
  Parenthesizing the macro parameters ... a best practice.
* firmware: partially-tracked source of "extra bits" messages.
  Add a TODO comment for further study.
* Improve reliability of `lf em 4x70 writekey`
  Authenticate w/new key after it is written.
  Particularly important for glass modules,
  or other tags with weaker coupling.
2024-03-11 17:14:03 -07:00
Antonio Gamez Diaz 90e9a0da39 Configure max write blocks to 251 before writing version or signature 2024-03-11 20:04:04 +01:00
Antonio Gamez Diaz 11ac8f768a Write signature when wiping card as NTAG213 2024-03-11 20:02:30 +01:00
Antonio Gamez Diaz dc9319f661 Update example UID/signature 2024-03-11 20:01:41 +01:00
iceman1001 99983d4dff text 2024-03-11 18:25:32 +01:00
iceman1001 d0b3b8d6b6 stricker checks for unprintable characters 2024-03-11 12:06:57 +01:00
Benjamin DELPYandGitHub 4b915610e1 Update intertic.py script to support Annecy
Signed-off-by: Benjamin DELPY <benjamin@gentilkiwi.com>
2024-03-10 19:20:16 +01:00
cyber-vi-kingandGitHub ec1a44ba36 Assa Abloy Hotel System in Spain
only block one is used, rest of the card is empty.
the key is the same on 5 cards I tested (got the key via mfkey32)

Signed-off-by: cyber-vi-king <104895454+cyber-vi-king@users.noreply.github.com>
2024-03-09 14:42:38 +01:00
iceman1001 9de6f59136 modified standalone mode hf_unisniff. It now also sniffs iclass. Another option added was for hw standalone -b, which allows you to trigger a particular sniff from client. Good for debugging w/o need to recompile or upload a config file. 2024-03-06 21:07:42 +01:00
iceman1001 6a933555df mem spiffs dump now honors the -d filename and save to file when used together with the -t param 2024-03-05 14:55:30 +01:00
iceman1001 189262cff7 text 2024-03-05 09:08:45 +01:00
iceman1001 75f1040980 add lib48 to experimental lib 2024-03-03 22:27:16 +01:00
IcemanandGitHub a0b26257db Merge branch 'master' into id48
Signed-off-by: Iceman <iceman@iuse.se>
2024-03-03 22:06:54 +01:00
iceman1001 2d6cd1a875 added support to show EG.DG7, and some textual changes for info 2024-03-03 21:56:28 +01:00
Henry Gabryjelski b4cfeca9fa Use INFO instead of NORMAL for PrintAndLogEx() 2024-03-03 12:17:02 -08:00
Henry Gabryjelski 12ee192782 disable assertions in PM3 build 2024-03-03 12:17:02 -08:00
Henry Gabryjelski 6c1aa10c91 bugfix: random alt nonce wasn't.
also improve output of multiple potential keys (remove extra `\n`)
2024-03-03 12:17:02 -08:00
Henry Gabryjelski 545c152d72 Remove large (128k) lookup table 2024-03-03 12:16:16 -08:00