chris/ruwuma
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

common: Use DeviceKeyId in more places for the CrossSigningKey type

Browse Source
This commit is contained in:
Damir Jelić 2022-03-23 13:46:32 +01:00 committed by Jonas Platte
parent 9ed83165d0
commit cf8f1b0e7e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crates/ruma-common/src/encryption.rs
View File

@ -118,7 +118,7 @@ pub enum OneTimeKey {
} }
/// Signatures for a `CrossSigningKey` object. /// Signatures for a `CrossSigningKey` object.
pub type CrossSigningKeySignatures = BTreeMap<Box<UserId>, BTreeMap<String, String>>; pub type CrossSigningKeySignatures = BTreeMap<Box<UserId>, BTreeMap<Box<DeviceKeyId>, String>>;
/// A cross signing key. /// A cross signing key.
#[derive(Clone, Debug, Deserialize, Serialize)] #[derive(Clone, Debug, Deserialize, Serialize)]
@ -133,7 +133,7 @@ pub struct CrossSigningKey {
/// The public key. /// The public key.
/// ///
/// The object must have exactly one property. /// The object must have exactly one property.
pub keys: BTreeMap<String, String>, pub keys: BTreeMap<Box<DeviceKeyId>, String>,
/// Signatures of the key. /// Signatures of the key.
/// ///
@ -147,7 +147,7 @@ impl CrossSigningKey {
pub fn new( pub fn new(
user_id: Box<UserId>, user_id: Box<UserId>,
usage: Vec<KeyUsage>, usage: Vec<KeyUsage>,
keys: BTreeMap<String, String>, keys: BTreeMap<Box<DeviceKeyId>, String>,
signatures: CrossSigningKeySignatures, signatures: CrossSigningKeySignatures,
) -> Self { ) -> Self {
Self { user_id, usage, keys, signatures } Self { user_id, usage, keys, signatures }