NFC Device Engagement support #110
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Ryan Tate <ryan.tate@spruceid.com>
Signed-off-by: Ryan Tate <ryan.tate@spruceid.com>
Signed-off-by: Ryan Tate <ryan.tate@spruceid.com>
Signed-off-by: Ryan Tate <ryan.tate@spruceid.com>
…ession Signed-off-by: Ryan Tate <ryan.tate@spruceid.com>
(instead of negotiated handover)
Signed-off-by: Ryan Tate <ryan.tate@spruceid.com>
Signed-off-by: Ryan Tate <ryan.tate@spruceid.com>
Signed-off-by: Ryan Tate <ryan.tate@spruceid.com>
Signed-off-by: Ryan Tate <ryan.tate@spruceid.com>
Signed-off-by: Ryan Tate <ryan.tate@spruceid.com>
presentation is broken - at some point, we broke the presentation flow in isomdl, even for QR.
alichay
force-pushed
the
feat/isomdl-device-engagement-refactor
branch
from
6cb8344 to
826bac1
Compare
I accidentally wiped over this commit, my bad! Co-authored-by: Tiago Nascimento <tiago.nascimento@spruceid.com>
Handover gets serialized to CBOR and used in shared secret derivation per 18013-5.
Now, you hit a todo!() if you try to use negotiated handover. Not perfect, but nicer than having a broken implementation.
alichay
changed the title
alichay
reviewed
Oct 1, 2025
Comment on lines
+54
to
+61
| // Stub out the real NdefUpdateDriver until we have negotiated handover finished. | ||
| #[derive(Debug, Clone)] | ||
| struct NdefUpdateDriver; | ||
| impl NdefUpdateDriver { | ||
| pub fn new() -> Self { | ||
| Self | ||
| } | ||
| } |
Contributor
There was a problem hiding this comment.
I wanted to leave the bones for adding back negotiated handover, because it was almost finished before the pivot to static handover for simplicity. We want to support negotiated handover in the future, so it's nice to have the main structure for when we bring it back.
Comment on lines
+122
to
+134
| pub fn get_carrier_info(&mut self) -> Option<Box<NegotiatedCarrierInfo>> { | ||
| if matches!(&self.state, ndef_handover::HandoverState::Done(_)) { | ||
| let mut state = ndef_handover::HandoverState::Init; | ||
| std::mem::swap(&mut self.state, &mut state); | ||
| let ndef_handover::HandoverState::Done(carrier_info) = state else { | ||
| // Guaranteed unreachable | ||
| return None; | ||
| }; | ||
| Some(carrier_info) | ||
| } else { | ||
| None | ||
| } | ||
| } |
Contributor
There was a problem hiding this comment.
This is written awkwardly to support the negotiated handover state machine, once that gets brought back.
Signed-off-by: Ryan Tate <ryan.tate@spruceid.com>
…gagement-refactor
Ryanmtate
commented
Oct 31, 2025
Ryanmtate
commented
Oct 31, 2025
Ryanmtate
commented
Oct 31, 2025
Ryanmtate
commented
Oct 31, 2025
Ryanmtate
commented
Oct 31, 2025
Ryanmtate
commented
Oct 31, 2025
sbihel
approved these changes
Nov 13, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This pull request introduces a static NFC handover implementation, adds BLE advertisement parsing, and refactors the device engagement module to better organize NFC-related functionality. The most significant changes are the addition of new modules for NFC APDU and BLE handling, the implementation of an APDU handover driver, and dependency updates.
NFC Handover and APDU Handling:
src/definitions/device_engagement/nfc/apdu.rs.src/definitions/device_engagement/nfc/apdu_handover.rs.BLE Advertisement Parsing:
src/definitions/device_engagement/nfc/ble.rs.Module Organization and Refactoring:
error,nfc, andnfc_optionsinsrc/definitions/device_engagement.rs, and reorganized imports accordingly. [1] [2]src/definitions/device_engagement/nfc/mod.rs. Also re-exported key types for external usage.Dependency Updates:
timecrate from version0.3.20to0.3.35and added thendef-rscrate as a new dependency inCargo.toml. [1] [2]Minor Improvements:
BleOptionsstructDefaultto simplify instantiation insrc/definitions/device_engagement.rs.