Skip to content

Commit e25b6f3

Browse files
committed
Cleanup
1 parent 7597dcf commit e25b6f3

File tree

5 files changed

+20
-22
lines changed

5 files changed

+20
-22
lines changed

crates/bitwarden-core/src/mobile/crypto.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use std::collections::HashMap;
88

99
use base64::{engine::general_purpose::STANDARD, Engine};
1010
use bitwarden_crypto::{
11-
AsymmetricCryptoKey, AsymmetricPublicCryptoKey, CryptoError, EncString, Kdf, KeyDecryptable, KeyEncryptable, MasterKey, SignatureAlgorithm, SignedPublicKeyOwnershipClaim, SigningKey, SymmetricCryptoKey, UnsignedSharedKey, UserKey
11+
AsymmetricCryptoKey, AsymmetricPublicCryptoKey, CryptoError, EncString, Kdf, KeyDecryptable, KeyEncryptable, MasterKey, SignedPublicKeyOwnershipClaim, SigningKey, SymmetricCryptoKey, UnsignedSharedKey, UserKey
1212
};
1313
use schemars::JsonSchema;
1414
use serde::{Deserialize, Serialize};

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@ use serde::{Deserialize, Serialize};
88
use sha2::Digest;
99

1010
#[derive(Debug, Clone, Serialize, Deserialize)]
11-
enum PublicKeyFingerprintAlgorithm {
11+
pub(crate) enum PublicKeyFingerprintAlgorithm {
1212
Sha256 = 1,
1313
}
1414

1515
/// A fingerprint represents a short, canonical representation of a public key.
1616
/// When signing a key, or showing a key to a user, this representation is used.
1717
#[derive(Debug, Clone, Serialize, Deserialize)]
1818
pub(crate) struct PublicKeyFingerprint {
19-
pub digest: serde_bytes::ByteBuf,
20-
pub algorithm: PublicKeyFingerprintAlgorithm,
19+
pub(crate) digest: serde_bytes::ByteBuf,
20+
pub(crate) algorithm: PublicKeyFingerprintAlgorithm,
2121
}
2222

23-
pub(crate) trait Fingerprintable {
23+
pub trait Fingerprintable {
2424
fn fingerprint(&self) -> PublicKeyFingerprint;
2525
fn verify_fingerprint(
2626
&self,

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@ pub use pin_key::PinKey;
2525
mod kdf;
2626
mod key_id;
2727
mod fingerprint;
28-
pub use fingerprint::{FingerprintableKey};
29-
pub(crate) use fingerprint::{PublicKeyFingerprint};
28+
pub(crate) use fingerprint::{FingerprintableKey, Fingerprintable, PublicKeyFingerprint};
3029
pub use kdf::{
3130
default_argon2_iterations, default_argon2_memory, default_argon2_parallelism,
3231
default_pbkdf2_iterations, Kdf,

crates/bitwarden-crypto/src/signing/claims.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
use serde::{Deserialize, Serialize};
22

3-
use crate::{CryptoError, FingerprintableKey, PublicKeyFingerprint, SignedObject, SigningKey, VerifyingKey};
3+
use crate::{AsymmetricPublicCryptoKey, CryptoError, FingerprintableKey, PublicKeyFingerprint, SignedObject, SigningKey, VerifyingKey};
4+
use crate::keys::Fingerprintable;
45

56
use super::SigningNamespace;
67

@@ -27,7 +28,7 @@ pub struct SignedPublicKeyOwnershipClaim(Vec<u8>);
2728

2829
impl SignedPublicKeyOwnershipClaim {
2930
pub fn make_claim_with_key(
30-
public_key: &impl FingerprintableKey,
31+
public_key: &AsymmetricPublicCryptoKey,
3132
signing_key: &SigningKey,
3233
) -> Result<Self, CryptoError> {
3334
let claim = PublicKeyOwnershipClaim::for_public_key(public_key);
@@ -41,7 +42,7 @@ impl SignedPublicKeyOwnershipClaim {
4142

4243
pub fn verify_claim(
4344
&self,
44-
public_key: &impl FingerprintableKey,
45+
public_key: &AsymmetricPublicCryptoKey,
4546
verifying_key: &VerifyingKey,
4647
) -> Result<bool, CryptoError> {
4748
let signed_object = SignedObject::from_cose(&self.0)?;

crates/bitwarden-wasm-internal/src/pure_crypto.rs

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ use std::str::FromStr;
22

33
use bitwarden_core::key_management::{KeyIds, SymmetricKeyId};
44
use bitwarden_crypto::{
5-
AsymmetricCryptoKey, AsymmetricPublicCryptoKey, CryptoError, Decryptable, EncString, Encryptable, Kdf, KeyDecryptable, KeyEncryptable, KeyStore, MasterKey, SignatureAlgorithm, SignedPublicKeyOwnershipClaim, SigningKey, SymmetricCryptoKey, UnsignedSharedKey, VerifyingKey
5+
AsymmetricCryptoKey, AsymmetricPublicCryptoKey, CryptoError, Decryptable, EncString,
6+
Encryptable, Kdf, KeyDecryptable, KeyEncryptable, KeyStore, MasterKey, SignatureAlgorithm,
7+
SignedPublicKeyOwnershipClaim, SigningKey, SymmetricCryptoKey, UnsignedSharedKey, VerifyingKey,
68
};
79
use wasm_bindgen::prelude::*;
810

@@ -266,12 +268,9 @@ impl PureCrypto {
266268

267269
pub fn verifying_key_for_signing_key(
268270
signing_key: String,
269-
wrapping_key: Vec<u8>
271+
wrapping_key: Vec<u8>,
270272
) -> Result<Vec<u8>, CryptoError> {
271-
let bytes = Self::symmetric_decrypt_bytes(
272-
signing_key,
273-
wrapping_key,
274-
)?;
273+
let bytes = Self::symmetric_decrypt_bytes(signing_key, wrapping_key)?;
275274
let signing_key = SigningKey::from_cose(&bytes)?;
276275
let verifying_key = signing_key.to_verifying_key();
277276
verifying_key.to_cose()
@@ -356,15 +355,14 @@ DnqOsltgPomWZ7xVfMkm9niL2OA=
356355
use base64::{engine::general_purpose::STANDARD, Engine};
357356
let claim: &str = "hFgbowEnBFC0jWbAn9dOvZfguK1cFmKIOgABOH8CoFhIoWtmaW5nZXJwcmludKJmZGlnZXN0WCDe5H2OEmMdkRddB1roMtfRqL15s0D9oVeGgFBQW7nM3GlhbGdvcml0aG1mU2hhMjU2WECFkZ/zA4W6O4qMoaQG4Df3jLhEatZH0JGdqe3VxxajDaAjk9JIGZShHLDp1Rgks0p9h2m74P/OgtphVvgdxB0C";
358357
let public_key: &str = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlGvPL2LFnoaaQ73uk4vh1X5rRsNpSp+ATzxIuwm/5BcOA37a87GCvBnT/LrYS/ylPHJkOeSxQGkbS8JhuZrk97FVsMTpX2GAyLMmyuT4H9J+AU6QFfZzRhtQlh37WmjclDm0/gZgLORP+osH6irhuPBU8xPrbOPi3lvNc9RKhk8UYddnOnfwUimu0C0GBZpkbBZCrwhDz+UAZdP9gm/wdhxgWwYwzQhmy8hrDLCWmmyb0oR2xuQ2BMGJpqxBhDVY4tKcH4YSNmKy2iOHUFBAo0NtCJdOydCy+aJhAlI49cOydyPOnGHSM0K73RvCTjgzl8c98H7lhB/ObNckpHmplwIDAQAB";
359-
let verifying_key: &str = "pgEBAlC0jWbAn9dOvZfguK1cFmKIAycEgQIgBiFYIDxhBrAPfGD9X/DLa+FS16Q4519WAmGv+Fq6w9cf45tg";
358+
let verifying_key: &str =
359+
"pgEBAlC0jWbAn9dOvZfguK1cFmKIAycEgQIgBiFYIDxhBrAPfGD9X/DLa+FS16Q4519WAmGv+Fq6w9cf45tg";
360360
let claim = STANDARD.decode(claim).unwrap();
361361
let public_key = STANDARD.decode(public_key).unwrap();
362362
let verifying_key = STANDARD.decode(verifying_key).unwrap();
363-
let result = PureCrypto::verify_public_key_ownership_claim(
364-
claim,
365-
public_key,
366-
verifying_key,
367-
).unwrap();
363+
let result =
364+
PureCrypto::verify_public_key_ownership_claim(claim, public_key, verifying_key)
365+
.unwrap();
368366
assert!(result);
369367
}
370368

0 commit comments

Comments
 (0)