From 7baa6f155a24e6b70f3931b104905633b4938a66 Mon Sep 17 00:00:00 2001 From: Hinton Date: Thu, 25 Apr 2024 10:43:30 +0200 Subject: [PATCH] Review feedback --- crates/bitwarden/src/auth/tde.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/crates/bitwarden/src/auth/tde.rs b/crates/bitwarden/src/auth/tde.rs index ff6328834..9b21aaa18 100644 --- a/crates/bitwarden/src/auth/tde.rs +++ b/crates/bitwarden/src/auth/tde.rs @@ -1,6 +1,6 @@ -use base64::{engine::general_purpose::STANDARD, Engine}; +use base64::engine::general_purpose::STANDARD; use bitwarden_crypto::{ - AsymmetricEncString, AsymmetricPublicCryptoKey, DeviceKey, EncString, Kdf, SensitiveVec, + AsymmetricEncString, AsymmetricPublicCryptoKey, DeviceKey, EncString, Kdf, SensitiveString, SymmetricCryptoKey, TrustDeviceResponse, UserKey, }; @@ -15,9 +15,9 @@ pub(super) fn make_register_tde_keys( org_public_key: String, remember_device: bool, ) -> Result { - let public_key = AsymmetricPublicCryptoKey::from_der(SensitiveVec::new(Box::new( - STANDARD.decode(org_public_key)?, - )))?; + let public_key = AsymmetricPublicCryptoKey::from_der( + SensitiveString::new(Box::new(org_public_key)).decode_base64(STANDARD)?, + )?; let mut rng = rand::thread_rng();