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

Proper 14443-4a support #151

Closed

Conversation

augustozanellato
Copy link
Contributor

Automatically send RATS to 14443-4a tags
Add ATS copy to long press quick clone
Fix long press quick clone supporting only 4b uid

Add ATS copy to long press quick clone
Fix long press quick clone supporting only 4b uid
@github-actions
Copy link

You are welcome to add an entry to the CHANGELOG.md as well

'sak_hex': hex(data[12]).lstrip('0x').rjust(2, '0'),
'atqa_hex': data[13:15].hex().upper()
Copy link
Contributor Author

Choose a reason for hiding this comment

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

removed .upper() because it's called anyways by the caller, added space separator for clarity

@@ -20,9 +20,11 @@ def parse_14a_scan_tag_result(data: bytearray):
"""
return {
'uid_size': data[10],
'uid_hex': data[0:data[10]].hex(),
'uid_hex': data[0:data[10]].hex(' '),
Copy link
Contributor Author

Choose a reason for hiding this comment

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

added space separator for clarity

@github-actions
Copy link

github-actions bot commented Sep 13, 2023

Built artifacts for commit 68d465d

Firmware

Client

@doegox
Copy link
Contributor

doegox commented Sep 13, 2023

😬 sorry.
If you're not in a hurry we can merge it manually after the massive PR, so this can have its own commit.
Good news is that there will be a new common format for tag info for HF14A_SCAN, MF1_GET_ANTI_COLL_DATA, MF1_SET_ANTI_COLL_DATA and ATS is already foreseen in it.
cf https://github.com/RfidResearchGroup/ChameleonUltra/blob/wip_protocol_refresh/docs/protocol.md#2000-hf14a_scan

@augustozanellato augustozanellato marked this pull request as draft September 13, 2023 22:52
@augustozanellato
Copy link
Contributor Author

My fault, should have checked the open PRs before opening one :)

If you're not in a hurry we can merge it manually after the massive PR

Definitely not in a hurry, feel free to take your time with the protocol refactoring. In the meantime I drafted this PR.

@doegox
Copy link
Contributor

doegox commented Sep 18, 2023

I pushed your changes as 09eb0d1 on the other PR.
Changes:

  • on 7-byte UID, RATS was sent before cascade lvl2
  • don't return errors on ATS, just log them, as we still want to get some info about the tag. The client can do the sanity checks.

@augustozanellato
Copy link
Contributor Author

I pushed your changes as 09eb0d1 on the other PR.
Ok, I’ll close this one then.

Changes:

  • on 7-byte UID, RATS was sent before cascade lvl2

Not sure if there were issues while importing my commit onto your branch, but on the PR RATS was correctly sent after cascade, see here, RATS is sent outside the cascade loop.

  • don't return errors on ATS, just log them, as we still want to get some info about the tag. The client can do the sanity checks.

Good idea, I’d document that clients are expected to validate ATS.

@doegox
Copy link
Contributor

doegox commented Sep 18, 2023

Not sure if there were issues while importing my commit onto your branch, but on the PR RATS was correctly sent after cascade

ha yes, sorry, I copy/pasted too early above "}"

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