refactor: rename SECRET_KEY_SIZE to PRIVATE_KEY_SIZE across multiple files

Author: dkmstr

crates/crypt/src/kem.rs

@@ -10,7 +10,7 @@ pub use libcrux_ml_kem::mlkem768::{
 use libcrux_ml_kem::mlkem768::generate_key_pair as ml_kem_generate_key_pair;
 
 // Note, changes to kem size (1024, 768 or 512) will need to update also SECRET_KEY_SIZE and CIPHERTEXT_SIZE
-pub const SECRET_KEY_SIZE: usize = 2400;
+pub const PRIVATE_KEY_SIZE: usize = 2400;
 pub const PUBLIC_KEY_SIZE: usize = 1184;
 pub const CIPHERTEXT_SIZE: usize = 1088;
 

crates/crypt/src/lib.rs

@@ -5,7 +5,7 @@ mod ticket;
 pub use ticket::{Ticket, TunnelMaterial};
 
 mod kem;
-pub use kem::{CIPHERTEXT_SIZE, SECRET_KEY_SIZE, PUBLIC_KEY_SIZE, generate_key_pair};
+pub use kem::{CIPHERTEXT_SIZE, PRIVATE_KEY_SIZE, PUBLIC_KEY_SIZE, generate_key_pair};
 
 #[cfg(test)]
 mod tests;

crates/crypt/src/tests.rs

@@ -1,7 +1,7 @@
 use anyhow::Result;
 use base64::{Engine as _, engine::general_purpose};
 
-use crate::{Ticket, SECRET_KEY_SIZE};
+use crate::{Ticket, PRIVATE_KEY_SIZE};
 
 const PRIVATE_KEY_768_TESTING: &str = "TzpPr8sQk1BBjmEFpTqCqdhTNfGdTpK37GBFaQWnigW8AZqMzrlSxRa+grYDdjJ1JiaiuSkpptCtIKsf\
     6QiD6HRJrAPNCJyxbmihz3KS0IOmjzUx4BYh/Ap/nYbE/0qWZFG0KdGKtSKWnOoQFCph0vOLQKnN8HGq\
@@ -65,11 +65,11 @@ const TEST_TICKET_JSON: &str = r#"{
 //   }
 // }
 
-fn get_private_key_bytes() -> Result<[u8; SECRET_KEY_SIZE]> {
+fn get_private_key_bytes() -> Result<[u8; PRIVATE_KEY_SIZE]> {
     let kem_private_key_bytes = general_purpose::STANDARD
         .decode(PRIVATE_KEY_768_TESTING)
         .map_err(|e| anyhow::format_err!("Failed to decode base64 KEM private key: {}", e))?;
-    let kem_private_key_bytes: [u8; SECRET_KEY_SIZE] = kem_private_key_bytes
+    let kem_private_key_bytes: [u8; PRIVATE_KEY_SIZE] = kem_private_key_bytes
         .try_into()
         .map_err(|_| anyhow::format_err!("Invalid KEM private key size"))?;
     Ok(kem_private_key_bytes)

crates/crypt/src/ticket.rs

@@ -9,7 +9,7 @@ use aes_gcm::{
 };
 use base64::{Engine as _, engine::general_purpose};
 
-use super::kem::{CIPHERTEXT_SIZE, CipherText, PrivateKey, SECRET_KEY_SIZE, decapsulate};
+use super::kem::{CIPHERTEXT_SIZE, CipherText, PrivateKey, PRIVATE_KEY_SIZE, decapsulate};
 
 #[derive(serde::Serialize, serde::Deserialize, Debug)]
 pub struct TunnelMaterial {
@@ -68,7 +68,7 @@ impl Ticket {
     pub fn recover_data_from_json(
         &self,
         ticket_id: &[u8],
-        kem_private_key: &[u8; SECRET_KEY_SIZE],
+        kem_private_key: &[u8; PRIVATE_KEY_SIZE],
     ) -> Result<serde_json::Value> {
         let kem_private_key = PrivateKey::from(kem_private_key);
 

crates/shared/src/broker/api/mod.rs

@@ -35,7 +35,7 @@ use base64::{Engine as _, engine::general_purpose};
 use reqwest::{Client, ClientBuilder};
 
 use crate::{consts, log};
-use crypt::{PUBLIC_KEY_SIZE, SECRET_KEY_SIZE, Ticket, generate_key_pair};
+use crypt::{PUBLIC_KEY_SIZE, PRIVATE_KEY_SIZE, Ticket, generate_key_pair};
 
 pub mod types;
 
@@ -55,7 +55,7 @@ pub struct UdsBrokerApi {
     broker_url: String,
     hostname: String,
     public_key: [u8; PUBLIC_KEY_SIZE],
-    private_key: [u8; SECRET_KEY_SIZE],
+    private_key: [u8; PRIVATE_KEY_SIZE],
 }
 
 impl UdsBrokerApi {
@@ -76,7 +76,6 @@ impl UdsBrokerApi {
             builder = builder.no_proxy();
         }
 
-
         // Note: unwraps are intentinonal here, if we cannot build the client, we want to
         // abort early.
 
@@ -96,7 +95,11 @@ impl UdsBrokerApi {
 
     // Only for tests
     #[cfg(test)]
-    pub fn with_keys(self, private_key: [u8; SECRET_KEY_SIZE], public_key: [u8; PUBLIC_KEY_SIZE]) -> Self {
+    pub fn with_keys(
+        self,
+        private_key: [u8; PRIVATE_KEY_SIZE],
+        public_key: [u8; PUBLIC_KEY_SIZE],
+    ) -> Self {
         Self {
             public_key,
             private_key,
@@ -175,11 +178,6 @@ impl BrokerApi for UdsBrokerApi {
                     percent: 0,
                 })
             })?
-
-        // response
-        //     .json::<types::BrokerResponse<types::Script>>()
-        //     .await?
-        //     .into_result()
     }
 
     async fn send_log(&self, log_str: String) -> Result<()> {

crates/shared/src/broker/api/tests.rs

@@ -106,11 +106,11 @@ const TICKET_RESPONSE_JSON: &str = r#"{
 }"#;
 const TICKET_ID: &str = "c6s9FAa5fhb854BVMckqUBJ4hOXg2iE5i1FYPCuktks4eNZD";
 
-fn get_keypair() -> Result<([u8; SECRET_KEY_SIZE], [u8; PUBLIC_KEY_SIZE])> {
+fn get_keypair() -> Result<([u8; PRIVATE_KEY_SIZE], [u8; PUBLIC_KEY_SIZE])> {
     let kem_private_key_bytes = general_purpose::STANDARD
         .decode(PRIVATE_KEY_768_TESTING)
         .map_err(|e| anyhow::format_err!("Failed to decode base64 KEM private key: {}", e))?;
-    let kem_private_key_bytes: [u8; SECRET_KEY_SIZE] = kem_private_key_bytes
+    let kem_private_key_bytes: [u8; PRIVATE_KEY_SIZE] = kem_private_key_bytes
         .try_into()
         .map_err(|_| anyhow::format_err!("Invalid KEM private key size"))?;
     let kem_public_key_bytes = general_purpose::STANDARD