char
/
matrix-rust-sdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

crypto: Split out the device_key signing method.

master
Damir Jelić 2020-10-27 13:48:51 +01:00
parent e757d605f5
commit 2077ea0ddf
3 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
matrix_sdk_crypto/src/identities/device.rs
View File

@ -438,7 +438,6 @@ impl ReadOnlyDevice {
) )
} }
#[cfg(test)]
pub(crate) fn as_device_keys(&self) -> DeviceKeys { pub(crate) fn as_device_keys(&self) -> DeviceKeys {
DeviceKeys { DeviceKeys {
user_id: self.user_id().clone(), user_id: self.user_id().clone(),

3
matrix_sdk_crypto/src/machine.rs
View File

@ -389,10 +389,9 @@ impl OlmMachine {
} else { } else {
info!("Trying to upload the existing cross signing identity"); info!("Trying to upload the existing cross signing identity");
let request = identity.as_upload_request().await; let request = identity.as_upload_request().await;
let device_keys = self.account.unsigned_device_keys();
// TODO remove this expect. // TODO remove this expect.
let signature_request = identity let signature_request = identity
.sign_device(device_keys) .sign_account(&self.account)
.await .await
.expect("Can't sign device keys"); .expect("Can't sign device keys");
Ok((request, signature_request)) Ok((request, signature_request))

24
matrix_sdk_crypto/src/olm/signing/mod.rs
View File

@ -32,7 +32,8 @@ use matrix_sdk_common::{
}; };
use crate::{ use crate::{
error::SignatureError, requests::UploadSigningKeysRequest, ReadOnlyAccount, UserIdentity, error::SignatureError, requests::UploadSigningKeysRequest, ReadOnlyAccount, ReadOnlyDevice,
UserIdentity,
}; };
use pk_signing::{MasterSigning, PickledSignings, SelfSigning, Signing, SigningError, UserSigning}; use pk_signing::{MasterSigning, PickledSignings, SelfSigning, Signing, SigningError, UserSigning};
@ -118,7 +119,25 @@ impl PrivateCrossSigningIdentity {
} }
/// Sign the given device keys with this identity. /// Sign the given device keys with this identity.
#[allow(dead_code)]
pub(crate) async fn sign_device( pub(crate) async fn sign_device(
&self,
device: &ReadOnlyDevice,
) -> Result<SignatureUploadRequest, SignatureError> {
let device_keys = device.as_device_keys();
self.sign_device_keys(device_keys).await
}
/// Sign an Olm account with this private identity.
pub(crate) async fn sign_account(
&self,
account: &ReadOnlyAccount,
) -> Result<SignatureUploadRequest, SignatureError> {
let device_keys = account.unsigned_device_keys();
self.sign_device_keys(device_keys).await
}
async fn sign_device_keys(
&self, &self,
mut device_keys: DeviceKeys, mut device_keys: DeviceKeys,
) -> Result<SignatureUploadRequest, SignatureError> { ) -> Result<SignatureUploadRequest, SignatureError> {
@ -179,9 +198,8 @@ impl PrivateCrossSigningIdentity {
}; };
let identity = Self::new_helper(account.user_id(), master).await; let identity = Self::new_helper(account.user_id(), master).await;
let device_keys = account.unsigned_device_keys();
let signature_request = identity let signature_request = identity
.sign_device(device_keys) .sign_account(account)
.await .await
.expect("Can't sign own device with new cross signign keys"); .expect("Can't sign own device with new cross signign keys");