Add decrypt

crates/bitwarden-crypto/src/chacha20.rs

@@ -18,23 +18,23 @@ pub fn encrypt_xchacha20_poly1305(
     let nonce = XChaCha20Poly1305::generate_nonce(&mut OsRng);
     // to dyn buf
     let mut buffer = secret_data.to_vec();
-    let ciphertext = cipher.encrypt_in_place(&nonce, &authenticated_data, &mut buffer);
+    let ciphertext = cipher.encrypt_in_place(&nonce, &[], &mut buffer);
     match ciphertext {
         Ok(_) => Ok((nonce.into(), buffer)),
         Err(_) => Err(CryptoError::InvalidKey),
     }
 }
 
-pub fn decrypt_xchacha_poly1305(
+pub fn decrypt_xchacha20_poly1305(
     nonce: &[u8; 24],
     authenticated_data: &[u8],
     key: &GenericArray<u8, U32>,
-    data: Vec<u8>,
+    data: &[u8],
 ) -> Result<Vec<u8>, CryptoError> {
     let cipher = XChaCha20Poly1305::new(&key);
     let nonce = GenericArray::from_slice(nonce);
-    let mut buffer = data;
-    let plaintext = cipher.decrypt_in_place(&nonce, &authenticated_data, &mut buffer);
+    let mut buffer = data.to_vec();
+    let plaintext = cipher.decrypt_in_place(&nonce, &[], &mut buffer);
     match plaintext {
         Ok(_) => Ok(buffer),
         Err(_) => Err(CryptoError::InvalidKey),

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

@@ -32,21 +32,23 @@ impl ClientCrypto {
         Ok(self.0.crypto().initialize_org_crypto(req).await?)
     }
 
+    pub fn decrypt_xchacha20_poly1305(data: &[u8], key: &[u8]) -> Result<Vec<u8>> {
+        let nonce = data[..24].try_into().unwrap();
+        let ciphertext = &data[24..];
+        let key_len32 = key[..32].try_into().unwrap();
+        let plaintext = chacha20::decrypt_xchacha20_poly1305(&nonce, &[], key_len32, ciphertext)?;
+        Ok(plaintext)
+    }
+
     pub fn encrypt_xchacha20_poly1305(
         secret_data: &[u8],
         authenticated_data: &[u8],
         key: &[u8],
     ) -> Result<Vec<u8>> {
-        println!("encrypt_xchacha20_poly1305");
-        println!("secret_data {:?}", secret_data);
-        println!("authenticated_data {:?}", authenticated_data);
-        println!("key {:?}", key);
         let key_len32 = key[..32].try_into().unwrap();
         let (nonce, ciphertext) =
             chacha20::encrypt_xchacha20_poly1305(secret_data, authenticated_data, key_len32)?;
-        println!("encrytped");
         let result: Vec<u8> = nonce.into_iter().chain(ciphertext.into_iter()).collect();
-        println!("result {:?}", result);
         Ok(result)
     }
 }