Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Expand the abilities of hf mfp #2194

Merged
merged 10 commits into from
Dec 3, 2023

Conversation

team-orangeBlue
Copy link
Contributor

Changes done:

  1. Support for encrypted transmission, now used by default
  2. Support for removing MAC from data exchange
  3. AES keys can now be changed in SL3
  4. Configuration blocks can now be changed
  5. Write Perso explains the possibilities of writing memory

What is to come:

  1. Switching sectors to SL1SL3mix/SL3 on Plus EV1 and newer using Key Indexes 9007 and 9006 accordingly (need testing material)
  2. Write the Mifare Plus EV1 SL1 configuration limiting DaVaBlock commands available (command 44h)
  3. Figure out this Random ID thing (I bricked 4 chips trying to figure out what to write).

Also hello iKey employee that asked me why I was buying those plus fobs. I killed all 3!

Add encryption
Add key updating
Add config updating

Signed-off-by: team-orangeBlue <63470411+team-orangeBlue@users.noreply.github.com>
Add support for writing special blocks
Add custom command bytes

Signed-off-by: team-orangeBlue <63470411+team-orangeBlue@users.noreply.github.com>
Won't compile otherwise

Signed-off-by: team-orangeBlue <63470411+team-orangeBlue@users.noreply.github.com>
All blocks are NOT data blocks
Some are now config/management keys/sector keys/...

Signed-off-by: team-orangeBlue <63470411+team-orangeBlue@users.noreply.github.com>
2 new commands
Some argument names updated

Signed-off-by: team-orangeBlue <63470411+team-orangeBlue@users.noreply.github.com>
2 new keys (SL3 sector switch; SL1SL3Mix sector switch).
"instead of than" - removed the than.

Signed-off-by: team-orangeBlue <63470411+team-orangeBlue@users.noreply.github.com>
We're done for now

Signed-off-by: team-orangeBlue <63470411+team-orangeBlue@users.noreply.github.com>
Signed-off-by: team-orangeBlue <63470411+team-orangeBlue@users.noreply.github.com>
@team-orangeBlue
Copy link
Contributor Author

Apparently in cmdhflist.c:

directive output may be truncated writing 1 byte into a region of size between 0 and 4

applied to the sector calculator.
Making compilation checks fail.

However testing on ProxSpace gives no errors..

May be reverted if fails

Signed-off-by: team-orangeBlue <63470411+team-orangeBlue@users.noreply.github.com>
int res = intExchangeRAW14aPlus(rcmd, plain ? 4 : sizeof(rcmd), activateField, leaveSignalON, dataout, maxdataoutlen, dataoutlen);
int MFPReadBlock(mf4Session_t *mf4session, bool plain, bool nomaccmd, bool nomacres, uint8_t blockNum, uint8_t blockCount, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen, uint8_t *mac) {
int cmdb = 0x31;
if (nomacres){cmdb = cmdb ^ 0x01;} // If we do not want MAC in reply, remove 0x01
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

make style....

@iceman1001 iceman1001 merged commit 44cd34d into RfidResearchGroup:master Dec 3, 2023
12 checks passed
@team-orangeBlue team-orangeBlue deleted the PlusPlus branch December 3, 2023 16:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants