Skip to content

crypto: Rename msk to master_key for consistency with the wider codebase #3677

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 10, 2024
Merged

crypto: Rename msk to master_key for consistency with the wider codebase #3677

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions crates/matrix-sdk-crypto/src/olm/group_sessions/sender_data.rs
View file
Open in desktop
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