base64 zeroization (#130)

WebOfTrust · Mar 10, 2023 · d0d1dd6 · d0d1dd6
1 parent 3cf0a18
commit d0d1dd6
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/src/core/matter/mod.rs b/src/core/matter/mod.rs
@@ -193,8 +193,10 @@ pub trait Matter: Default {
             buffer[szg.ls as usize..].clone_from_slice(&raw);
             raw.zeroize();
 
-            let b64 = b64_engine::URL_SAFE.encode(&buffer);
-
+            let mut b64_vec = Zeroizing::new(vec![0u8; buffer.len() * 4 / 3]);
+            b64_engine::URL_SAFE.encode_slice(&buffer, &mut b64_vec)?;
+            // this does a transmute of pointers under the hood so zeroizing the vec should be enough
+            let b64 = std::str::from_utf8(&b64_vec)?;
             Ok(format!("{both}{b64}"))
         } else {
             let both = code;
@@ -210,8 +212,9 @@ pub trait Matter: Default {
             buffer[ps..].clone_from_slice(&raw);
             raw.zeroize();
 
-            let b64 = b64_engine::URL_SAFE.encode(&buffer);
-
+            let mut b64_vec = Zeroizing::new(vec![0u8; buffer.len() * 4 / 3]);
+            b64_engine::URL_SAFE.encode_slice(&buffer, &mut b64_vec)?;
+            let b64 = std::str::from_utf8(&b64_vec)?;
             Ok(format!("{both}{}", &b64[cs % 4..]))
         }
     }