Skip to content

Commit bb6217e

Browse files
committed
serialize immutable metadata extension
1 parent e67ba58 commit bb6217e

4 files changed

Lines changed: 18 additions & 7 deletions

File tree

.envrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
use flake ~/code/environments#rust-nightly

openmls/src/extensions/mod.rs

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -167,15 +167,18 @@ impl Serialize for ExtensionType {
167167
serializer.serialize_unit_variant("ExtensionType", 4, "ExternalSenders")
168168
}
169169
Self::LastResort => serializer.serialize_unit_variant("ExtensionType", 5, "LastResort"),
170+
Self::ImmutableMetadata => {
171+
serializer.serialize_unit_variant("ExtensionType", 6, "ImmutableMetadata")
172+
}
170173
Self::Unknown(v) => {
171-
serializer.serialize_newtype_variant("ExtensionType", 6, "Unknown", v)
174+
serializer.serialize_newtype_variant("ExtensionType", 7, "Unknown", v)
172175
}
173176
Self::Grease(v) => {
174-
serializer.serialize_newtype_variant("ExtensionType", 7, "Grease", v)
177+
serializer.serialize_newtype_variant("ExtensionType", 8, "Grease", v)
175178
}
176179
#[cfg(feature = "extensions-draft-08")]
177180
Self::AppDataDictionary => {
178-
serializer.serialize_unit_variant("ExtensionType", 8, "AppDataDictionary")
181+
serializer.serialize_unit_variant("ExtensionType", 9, "AppDataDictionary")
179182
}
180183
}
181184
}
@@ -565,15 +568,18 @@ impl Serialize for Extension {
565568
Self::LastResort(e) => {
566569
serializer.serialize_newtype_variant("Extension", 5, "LastResort", e)
567570
}
571+
Self::ImmutableMetadata(e) => {
572+
serializer.serialize_newtype_variant("Extension", 6, "ImmutableMetadata", e)
573+
}
568574
Self::Unknown(t, data) => {
569-
let mut tv = serializer.serialize_tuple_variant("Extension", 6, "Unknown", 2)?;
575+
let mut tv = serializer.serialize_tuple_variant("Extension", 7, "Unknown", 2)?;
570576
tv.serialize_field(t)?;
571577
tv.serialize_field(data)?;
572578
tv.end()
573579
}
574580
#[cfg(feature = "extensions-draft-08")]
575581
Self::AppDataDictionary(e) => {
576-
serializer.serialize_newtype_variant("Extension", 7, "AppDataDictionary", e)
582+
serializer.serialize_newtype_variant("Extension", 8, "AppDataDictionary", e)
577583
}
578584
}
579585
}

openmls/src/prelude.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,11 @@ pub use crate::group::{
1313
pub use crate::group::public_group::{errors::*, PublicGroup};
1414

1515
// Ciphersuite
16-
pub use crate::ciphersuite::{hash_ref::KeyPackageRef, signable::*, signature::*, *};
16+
pub use crate::ciphersuite::{
17+
hash_ref::{KeyPackageRef, ProposalRef},
18+
signable::*,
19+
signature::*,
20+
};
1721

1822
// Messages
1923
pub use crate::messages::{external_proposals::*, proposals::*, proposals_in::*, *};

openmls/src/test_utils/storage_state.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::prelude::{hash_ref::ProposalRef, past_secrets::MessageSecretsStore, *};
1+
use crate::prelude::{past_secrets::MessageSecretsStore, ProposalRef, *};
22

33
use crate::schedule::psk::store::ResumptionPskStore;
44
use crate::schedule::GroupEpochSecrets;

0 commit comments

Comments
 (0)