add event type (is_trigger bit) to Info #598
Conversation
src/hpke/mod.rs
Outdated
| @@ -373,7 +424,7 @@ mod tests { | |||
| let mut suite = EncryptionSuite::new(10, rng.clone()); | |||
| // keep the originals, in case if we need to damage them | |||
| let (mut mkp_clone, mut site_domain_clone, mut helper_clone) = (mkp_origin.clone(), site_domain.clone(), helper_origin.clone()); | |||
| let info = Info::new(0, 0, &mkp_origin, &site_domain, &helper_origin).unwrap(); | |||
| let info = Info::new(0, 0, EventType::Source, &mkp_origin, &site_domain, &helper_origin).unwrap(); | |||
There was a problem hiding this comment.
this validates that source events will fail to decrypt with trigger bits, but does not validate the opposite.
We can do both and it is easy with proptest
- generate a random bit
fn arbitrary_info_corruption(corrupted_info_field in 1..6,
mkp_origin in "[a-z]{10}",
site_domain in "[a-z]{10}",
helper_origin in "[a-z]{10}",
trigger_bit in 0_u8..=1, // <---
seed: [u8; 32]) {- convert this bit to event type
let event_type = EventType::try_from(trigger_bit).unwrap();- flip the bit to induce trigger bit corruption
3 => Info {
event_type: EventType::try_from(trigger_bit ^ 1).unwrap(),
..encryption.info
},There was a problem hiding this comment.
okay, I added this to the arbitrary_info_corruption test and I think fixed the format issue
src/hpke/info.rs
Outdated
| @@ -80,7 +84,8 @@ impl<'a> Info<'a> { | |||
| + self.site_domain.len() | |||
| + 4 // account for 4 delimiters | |||
| + std::mem::size_of_val(&self.key_id) | |||
| + std::mem::size_of_val(&self.epoch); | |||
| + std::mem::size_of_val(&self.epoch) | |||
| + std::mem::size_of_val( &self.event_type); | |||
There was a problem hiding this comment.
I am genuinely surprised that rustfmt hasn't flagged that
There was a problem hiding this comment.
I don't think the latest version has that; it should automatically update the PR, right? https://github.com/bmcase/raw-ipa/blob/main/src/hpke/info.rs
There was a problem hiding this comment.
There was a problem hiding this comment.
looks like it is still there :)
-----v-----
std::mem::size_of_val( &self.event_type);There was a problem hiding this comment.
to update this PR, you would need to push your changes again: git push
Implementing #593 to add an event type (is_trigger) to the associated data/Info. Right now have it with
pub typeand not anenum