Refactoring to support future methods#406
Open
ElsaLopez133 wants to merge 5 commits intolake-rs:mainfrom
Open
Conversation
ElsaLopez133
force-pushed
the
refactor-multi-method-support
branch
2 times, most recently
from
7204516 to
af4dbe6
Compare
ElsaLopez133
force-pushed
the
refactor-multi-method-support
branch
from
af4dbe6 to
97097f9
Compare
For each function we match on state and create method-specific fiunctions. For example, we have r_prepare_message_2 and we match based on emthod to either use t_prepare_message_2_statstat or r_prepare_message_2_psk
WilliamTakeshi
approved these changes
Feb 23, 2026
lib/src/edhoc.rs
Outdated
|
|
||
| Ok(( | ||
| WaitM3 { | ||
| method: state.method, |
Contributor
There was a problem hiding this comment.
This will always be StatStat I think
Contributor
Author
There was a problem hiding this comment.
It will be in that function yes. For PSK it will use a diffrerent r_prepare_message_2_psk, and state.method will be then EDHOCMethod::PSK
lib/src/edhoc.rs
Outdated
| let state = ProcessedM2 { | ||
| // FIXME | ||
| // We need the method for next step. Since we are in the branch of StatStat, | ||
| // we can add EDHOCMethod::StatStat |
Contributor
There was a problem hiding this comment.
I dont think we need this FIXME, I think we MUST pass the method around for some messages.
ElsaLopez133
force-pushed
the
refactor-multi-method-support
branch
2 times, most recently
from
9976f2b to
f54f4df
Compare
ElsaLopez133
force-pushed
the
refactor-multi-method-support
branch
from
f54f4df to
69792a9
Compare
chrysn
reviewed
Feb 23, 2026
Comment on lines
518
to
534
| #[derive(Debug)] | ||
| pub enum ProcessingM2 { | ||
| StatStat(ProcessingM2StatStat), // PSK(PProcessingM2PSK) // To be added later | ||
| } | ||
| #[derive(Debug)] | ||
| #[repr(C)] | ||
| pub struct ProcessingM2 { | ||
| pub struct ProcessingM2StatStat { | ||
| pub mac_2: BytesMac2, | ||
| pub prk_2e: BytesHashLen, | ||
| pub th_2: BytesHashLen, | ||
| pub x: BytesP256ElemLen, | ||
| pub g_y: BytesP256ElemLen, | ||
| pub plaintext_2: BufferPlaintext2, | ||
| pub c_r: ConnId, | ||
| pub id_cred_r: IdCred, | ||
| pub ead_2: EadItems, | ||
| } |
Member
There was a problem hiding this comment.
This makes all the state of ProcessingM2 & co dependent on the method, rather than (as in the last call) just the parts that differ in other methods. Which of those fields are actually different in PSK?
I'd have expected something more like
#[derive(Debug)]
pub struct ProcessingM2 {
pub method_specifics: ProcessingM2MethodSpecifics,
pub prk_2e: BytesHashLen,
pub th_2: BytesHashLen,
pub x: BytesP256ElemLen,
pub g_y: BytesP256ElemLen,
pub plaintext_2: BufferPlaintext2,
pub c_r: ConnId,
pub ead_2: EadItems,
}
pub enum ProcessingM2MethodSpecifics {
StatStat {
pub mac_2: BytesMac2,
pub id_cred_r: IdCred,
},
// PSK, -- is empty, but in other stages it might have fields that StatStat has not.
}so that the 90% of the code that would be duplicated can still reach for the common items.
ElsaLopez133
force-pushed
the
refactor-multi-method-support
branch
2 times, most recently
from
a18f9ce to
a5de4f7
Compare
We avoid repetition of shared-values among methods This affects ProcessingM2 and ProcessingM3
ElsaLopez133
force-pushed
the
refactor-multi-method-support
branch
from
a5de4f7 to
35820e5
Compare
| pub struct ProcessingM3 { | ||
| pub mac_3: BytesMac3, | ||
| pub method_specifics: ProcessingM3MethodSpecifics, | ||
| pub method: EDHOCMethod, |
Contributor
There was a problem hiding this comment.
you don't need both method_specifics and method, since method_specifics already tell you which method you are in. Just match against method_specifics
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Refactoring current code to add additional methods in the future (PSK)
methodin some states to be able to match on it.r_verify_message_3_statstat,i_verify_message_2_statsat)