Skip to content

Commit 948baa5

Browse files
committed
Merge branch 'km/cose-content-format' of github.com:bitwarden/sdk-internal into km/cose-content-format
2 parents 954a6a5 + 6c8092a commit 948baa5

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

crates/bitwarden-crypto/src/keys/device_key.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ impl DeviceKey {
6565
protected_user_key: UnsignedSharedKey,
6666
) -> Result<SymmetricCryptoKey> {
6767
let device_private_key: Vec<u8> = protected_device_private_key.decrypt_with_key(&self.0)?;
68-
let device_private_key: Pkcs8PrivateKeyBytes = Bytes::from(device_private_key);
68+
let device_private_key = Pkcs8PrivateKeyBytes::from(device_private_key);
6969
let device_private_key = AsymmetricCryptoKey::from_der(&device_private_key)?;
7070

7171
let user_key: SymmetricCryptoKey =

crates/bitwarden-crypto/src/keys/symmetric_crypto_key.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,12 +150,12 @@ impl SymmetricCryptoKey {
150150
match encoded_key {
151151
EncodedSymmetricKey::BitwardenLegacyKey(_) => {
152152
let encoded_key: Vec<u8> = encoded_key.into();
153-
Bytes::from(encoded_key)
153+
BitwardenLegacyKeyBytes::from(encoded_key)
154154
}
155155
EncodedSymmetricKey::CoseKey(_) => {
156156
let mut encoded_key: Vec<u8> = encoded_key.into();
157157
pad_key(&mut encoded_key, Self::AES256_CBC_HMAC_KEY_LEN + 1);
158-
Bytes::from(encoded_key)
158+
BitwardenLegacyKeyBytes::from(encoded_key)
159159
}
160160
}
161161
}

0 commit comments

Comments
 (0)