Cleanup

Author: quexten

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

@@ -8,7 +8,7 @@ use std::collections::HashMap;
 
 use base64::{engine::general_purpose::STANDARD, Engine};
 use bitwarden_crypto::{
-    AsymmetricCryptoKey, AsymmetricPublicCryptoKey, CryptoError, EncString, Kdf, KeyDecryptable, KeyEncryptable, MasterKey, SignatureAlgorithm, SignedPublicKeyOwnershipClaim, SigningKey, SymmetricCryptoKey, UnsignedSharedKey, UserKey
+    AsymmetricCryptoKey, AsymmetricPublicCryptoKey, CryptoError, EncString, Kdf, KeyDecryptable, KeyEncryptable, MasterKey, SignedPublicKeyOwnershipClaim, SigningKey, SymmetricCryptoKey, UnsignedSharedKey, UserKey
 };
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};

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

@@ -8,19 +8,19 @@ use serde::{Deserialize, Serialize};
 use sha2::Digest;
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
-enum PublicKeyFingerprintAlgorithm {
+pub(crate) enum PublicKeyFingerprintAlgorithm {
     Sha256 = 1,
 }
 
 /// A fingerprint represents a short, canonical representation of a public key.
 /// When signing a key, or showing a key to a user, this representation is used.
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub(crate) struct PublicKeyFingerprint {
-    pub digest: serde_bytes::ByteBuf,
-    pub algorithm: PublicKeyFingerprintAlgorithm,
+    pub(crate) digest: serde_bytes::ByteBuf,
+    pub(crate) algorithm: PublicKeyFingerprintAlgorithm,
 }
 
-pub(crate) trait Fingerprintable {
+pub trait Fingerprintable {
     fn fingerprint(&self) -> PublicKeyFingerprint;
     fn verify_fingerprint(
         &self,

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

@@ -25,8 +25,7 @@ pub use pin_key::PinKey;
 mod kdf;
 mod key_id;
 mod fingerprint;
-pub use fingerprint::{FingerprintableKey};
-pub(crate) use fingerprint::{PublicKeyFingerprint};
+pub(crate) use fingerprint::{FingerprintableKey, Fingerprintable, PublicKeyFingerprint};
 pub use kdf::{
     default_argon2_iterations, default_argon2_memory, default_argon2_parallelism,
     default_pbkdf2_iterations, Kdf,

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

@@ -1,6 +1,7 @@
 use serde::{Deserialize, Serialize};
 
-use crate::{CryptoError, FingerprintableKey, PublicKeyFingerprint, SignedObject, SigningKey, VerifyingKey};
+use crate::{AsymmetricPublicCryptoKey, CryptoError, FingerprintableKey, PublicKeyFingerprint, SignedObject, SigningKey, VerifyingKey};
+use crate::keys::Fingerprintable;
 
 use super::SigningNamespace;
 
@@ -27,7 +28,7 @@ pub struct SignedPublicKeyOwnershipClaim(Vec<u8>);
 
 impl SignedPublicKeyOwnershipClaim {
     pub fn make_claim_with_key(
-        public_key: &impl FingerprintableKey,
+        public_key: &AsymmetricPublicCryptoKey,
         signing_key: &SigningKey,
     ) -> Result<Self, CryptoError> {
         let claim = PublicKeyOwnershipClaim::for_public_key(public_key);
@@ -41,7 +42,7 @@ impl SignedPublicKeyOwnershipClaim {
 
     pub fn verify_claim(
         &self,
-        public_key: &impl FingerprintableKey,
+        public_key: &AsymmetricPublicCryptoKey,
         verifying_key: &VerifyingKey,
     ) -> Result<bool, CryptoError> {
         let signed_object = SignedObject::from_cose(&self.0)?;

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

@@ -2,7 +2,9 @@ use std::str::FromStr;
 
 use bitwarden_core::key_management::{KeyIds, SymmetricKeyId};
 use bitwarden_crypto::{
-    AsymmetricCryptoKey, AsymmetricPublicCryptoKey, CryptoError, Decryptable, EncString, Encryptable, Kdf, KeyDecryptable, KeyEncryptable, KeyStore, MasterKey, SignatureAlgorithm, SignedPublicKeyOwnershipClaim, SigningKey, SymmetricCryptoKey, UnsignedSharedKey, VerifyingKey
+    AsymmetricCryptoKey, AsymmetricPublicCryptoKey, CryptoError, Decryptable, EncString,
+    Encryptable, Kdf, KeyDecryptable, KeyEncryptable, KeyStore, MasterKey, SignatureAlgorithm,
+    SignedPublicKeyOwnershipClaim, SigningKey, SymmetricCryptoKey, UnsignedSharedKey, VerifyingKey,
 };
 use wasm_bindgen::prelude::*;
 
@@ -266,12 +268,9 @@ impl PureCrypto {
 
     pub fn verifying_key_for_signing_key(
         signing_key: String,
-        wrapping_key: Vec<u8>
+        wrapping_key: Vec<u8>,
     ) -> Result<Vec<u8>, CryptoError> {
-        let bytes = Self::symmetric_decrypt_bytes(
-            signing_key,
-            wrapping_key,
-        )?;
+        let bytes = Self::symmetric_decrypt_bytes(signing_key, wrapping_key)?;
         let signing_key = SigningKey::from_cose(&bytes)?;
         let verifying_key = signing_key.to_verifying_key();
         verifying_key.to_cose()
@@ -356,15 +355,14 @@ DnqOsltgPomWZ7xVfMkm9niL2OA=
         use base64::{engine::general_purpose::STANDARD, Engine};
         let claim: &str = "hFgbowEnBFC0jWbAn9dOvZfguK1cFmKIOgABOH8CoFhIoWtmaW5nZXJwcmludKJmZGlnZXN0WCDe5H2OEmMdkRddB1roMtfRqL15s0D9oVeGgFBQW7nM3GlhbGdvcml0aG1mU2hhMjU2WECFkZ/zA4W6O4qMoaQG4Df3jLhEatZH0JGdqe3VxxajDaAjk9JIGZShHLDp1Rgks0p9h2m74P/OgtphVvgdxB0C";
         let public_key: &str = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlGvPL2LFnoaaQ73uk4vh1X5rRsNpSp+ATzxIuwm/5BcOA37a87GCvBnT/LrYS/ylPHJkOeSxQGkbS8JhuZrk97FVsMTpX2GAyLMmyuT4H9J+AU6QFfZzRhtQlh37WmjclDm0/gZgLORP+osH6irhuPBU8xPrbOPi3lvNc9RKhk8UYddnOnfwUimu0C0GBZpkbBZCrwhDz+UAZdP9gm/wdhxgWwYwzQhmy8hrDLCWmmyb0oR2xuQ2BMGJpqxBhDVY4tKcH4YSNmKy2iOHUFBAo0NtCJdOydCy+aJhAlI49cOydyPOnGHSM0K73RvCTjgzl8c98H7lhB/ObNckpHmplwIDAQAB";
-        let verifying_key: &str = "pgEBAlC0jWbAn9dOvZfguK1cFmKIAycEgQIgBiFYIDxhBrAPfGD9X/DLa+FS16Q4519WAmGv+Fq6w9cf45tg";
+        let verifying_key: &str =
+            "pgEBAlC0jWbAn9dOvZfguK1cFmKIAycEgQIgBiFYIDxhBrAPfGD9X/DLa+FS16Q4519WAmGv+Fq6w9cf45tg";
         let claim = STANDARD.decode(claim).unwrap();
         let public_key = STANDARD.decode(public_key).unwrap();
         let verifying_key = STANDARD.decode(verifying_key).unwrap();
-        let result = PureCrypto::verify_public_key_ownership_claim(
-            claim,
-            public_key,
-            verifying_key,
-        ).unwrap();
+        let result =
+            PureCrypto::verify_public_key_ownership_claim(claim, public_key, verifying_key)
+                .unwrap();
         assert!(result);
     }