fix: fix the bug of failed compilation

Author: wa5i

src/core.rs

@@ -68,8 +68,8 @@ pub struct CoreState {
     #[zeroize(skip)]
     pub system_view: Option<Arc<BarrierView>>,
     pub sealed: bool,
-    pub unseal_key_shares: Vec<Vec<u8>>,
     pub hmac_key: Vec<u8>,
+    unseal_key_shares: Vec<Vec<u8>>,
 }
 
 pub struct Core {

src/http/sys.rs

@@ -3,6 +3,7 @@ use std::sync::Arc;
 use actix_web::{http::StatusCode, web, HttpRequest, HttpResponse};
 use serde::{Deserialize, Serialize};
 use serde_json::json;
+use zeroize::{Zeroize, Zeroizing};
 
 use crate::{
     core::{Core, SealConfig},
@@ -24,13 +25,15 @@ pub struct InitRequest {
     pub secret_threshold: u8,
 }
 
-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize, Zeroize)]
+#[zeroize(drop)]
 pub struct InitResponse {
     pub keys: Vec<String>,
     pub root_token: String,
 }
 
-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize, Zeroize)]
+#[zeroize(drop)]
 struct UnsealRequest {
     key: String,
 }
@@ -101,7 +104,7 @@ async fn sys_init_put_request_handler(
     let result = core.init(&seal_config)?;
 
     let resp =
-        InitResponse { keys: result.secret_shares.iter().map(hex::encode).collect(), root_token: result.root_token };
+        InitResponse { keys: result.secret_shares.iter().map(hex::encode).collect(), root_token: result.root_token.clone() };
 
     Ok(response_json_ok(None, resp))
 }
@@ -126,7 +129,7 @@ async fn sys_unseal_request_handler(
     // TODO
     let payload = serde_json::from_slice::<UnsealRequest>(&body)?;
     body.clear();
-    let key = hex::decode(payload.key)?;
+    let key: Zeroizing<Vec<u8>> = Zeroizing::new(hex::decode(payload.key.clone())?);
 
     let _result = core.unseal(&key)?;
 

src/storage/barrier_aes_gcm.rs

@@ -39,6 +39,7 @@ struct BarrierInit {
 }
 
 #[derive(Debug, Clone, Default, Zeroize)]
+#[zeroize(drop)]
 struct BarrierInfo {
     #[default(true)]
     sealed: bool,

src/test_utils.rs

@@ -113,7 +113,7 @@ impl TestHttpServer {
 
         assert!(unseal_test_rusty_vault_core(core.as_ref(), &k));
 
-        root_token = init_result.root_token;
+        root_token = init_result.root_token.clone();
         println!("root_token: {:?}", root_token);
 
         test_http_server.root_token = root_token;
@@ -1069,7 +1069,7 @@ pub fn new_unseal_test_rusty_vault(name: &str) -> (RustyVault, Arc<Core>, String
 
     assert!(unseal_test_rusty_vault(&rvault, &k));
 
-    root_token = init_result.root_token;
+    root_token = init_result.root_token.clone();
     println!("root_token: {:?}", root_token);
 
     let core = rvault.core.load().clone();

tests/test_default_logical.rs

@@ -417,7 +417,7 @@ async fn test_default_logical() {
         unsealed = unseal.unwrap();
     }
 
-    root_token = init_result.root_token;
+    root_token = init_result.root_token.clone();
 
     assert!(unsealed);