update

crates/state/src/file.rs

@@ -1,6 +1,6 @@
 use std::path::PathBuf;
 
-use aes_gcm::aead::consts::{U12, U16};
+use aes_gcm::aead::consts::{U12, U16, U32};
 use aes_gcm::aead::{Aead, AeadCore, KeyInit, OsRng};
 use aes_gcm::aes::Aes256;
 use aes_gcm::{Aes256Gcm, AesGcm, Nonce};
@@ -121,8 +121,8 @@ impl FileAttachment {
 
 pub fn encrypt(data: &[u8]) -> Result<EncryptedFile, Error> {
     let key = Aes256Gcm::generate_key(OsRng);
-    let nonce = Aes256Gcm::generate_nonce(OsRng);
-    let cipher = Aes256Gcm::new(&key);
+    let nonce = AesGcm::<Aes256, U16>::generate_nonce(OsRng);
+    let cipher = AesGcm::<Aes256, U16>::new(&key);
 
     let data = cipher
         .encrypt(&nonce, data)
@@ -146,7 +146,6 @@ pub fn decrypt(data: &[u8], key: &str, nonce: &str) -> Result<Vec<u8>, Error> {
         );
     }
 
-    // Amethyst uses 16 bytes nonces, everything else uses the standard 12
     match nonce.len() {
         12 => Aes256Gcm::new_from_slice(&key)
             .map_err(|_| anyhow!("Invalid decryption key"))?
@@ -156,6 +155,10 @@ pub fn decrypt(data: &[u8], key: &str, nonce: &str) -> Result<Vec<u8>, Error> {
             .map_err(|_| anyhow!("Invalid decryption key"))?
             .decrypt(Nonce::<U16>::from_slice(&nonce), data)
             .map_err(|_| anyhow!("Failed to decrypt file")),
+        32 => AesGcm::<Aes256, U32>::new_from_slice(&key)
+            .map_err(|_| anyhow!("Invalid decryption key"))?
+            .decrypt(Nonce::<U32>::from_slice(&nonce), data)
+            .map_err(|_| anyhow!("Failed to decrypt file")),
         len => bail!("Unsupported decryption nonce length: {len} bytes"),
     }
 }