Skip to content

Commit

Permalink
Merge pull request #3677 from matrix-org/andybalaam/rename_msk_master…
Browse files Browse the repository at this point in the history
…_key

crypto: Rename msk to master_key for consistency with the wider codebase
  • Loading branch information
andybalaam authored Jul 10, 2024
2 parents 40343aa + 0449ca8 commit 847bf5b
Showing 1 changed file with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,13 @@ pub enum SenderData {
user_id: OwnedUserId,

/// The cross-signing key of the user who established this session.
msk: Ed25519PublicKey,
master_key: Ed25519PublicKey,

/// Whether, at the time we checked the signature on the device,
/// we had actively verified that `msk` belongs to the user.
/// we had actively verified that `master_key` belongs to the user.
/// If false, we had simply accepted the key as this user's latest
/// key.
msk_verified: bool,
master_key_verified: bool,
},
}

Expand Down

0 comments on commit 847bf5b

Please sign in to comment.