feat(rtc_types::enclave_messages::set_access_key) add Request::unseal…

…ed_size field
ntls-io · Jul 8, 2021 · afa7cf4 · afa7cf4
1 parent 4a65406
commit afa7cf4
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/codegen/auth_enclave/bindings.h b/codegen/auth_enclave/bindings.h
@@ -14,7 +14,7 @@
 
 #define ARCHIVED_ENCLAVE_ID_SIZE 8
 
-#define SET_ACCESS_KEY_REQUEST_SIZE 40
+#define SET_ACCESS_KEY_REQUEST_SIZE 48
 
 #define SET_ACCESS_KEY_RESPONSE_SIZE 1
 

diff --git a/codegen/data_enclave/bindings.h b/codegen/data_enclave/bindings.h
@@ -14,7 +14,7 @@
 
 #define ARCHIVED_ENCLAVE_ID_SIZE 8
 
-#define SET_ACCESS_KEY_REQUEST_SIZE 40
+#define SET_ACCESS_KEY_REQUEST_SIZE 48
 
 #define SET_ACCESS_KEY_RESPONSE_SIZE 1
 

diff --git a/codegen/exec_enclave/bindings.h b/codegen/exec_enclave/bindings.h
@@ -14,7 +14,7 @@
 
 #define ARCHIVED_ENCLAVE_ID_SIZE 8
 
-#define SET_ACCESS_KEY_REQUEST_SIZE 40
+#define SET_ACCESS_KEY_REQUEST_SIZE 48
 
 #define SET_ACCESS_KEY_RESPONSE_SIZE 1
 

diff --git a/rtc_types/src/enclave_messages/ffi_set_access_key.rs b/rtc_types/src/enclave_messages/ffi_set_access_key.rs
@@ -22,7 +22,7 @@ pub const ARCHIVED_ENCLAVE_ID_SIZE: usize = 8;
 // (Keep these FFI type comments in sync between set_access_key and ffi_set_access_key, for diffing!)
 
 // FFI type: REQUEST_SIZE
-pub const SET_ACCESS_KEY_REQUEST_SIZE: usize = 40;
+pub const SET_ACCESS_KEY_REQUEST_SIZE: usize = 48;
 
 // FFI type: EncryptedRequest
 #[repr(C)]

diff --git a/rtc_types/src/enclave_messages/set_access_key.rs b/rtc_types/src/enclave_messages/set_access_key.rs
@@ -11,6 +11,9 @@ pub struct Request {
     //      It might make sense to conditionally export this as public.
     pub uuid: [u8; 16],       // TODO: Use UUID crate?
     pub access_key: [u8; 24], // [u8; ACCESS_KEY_BYTES]
+
+    /// Size of the dataset in bytes, to be cached alongside the UUID.
+    pub unsealed_size: u64,
 }
 
 #[derive(Archive, Deserialize, Serialize, Debug, PartialEq)]
@@ -48,6 +51,7 @@ mod test {
         let request = set_access_key::Request {
             uuid: [5u8; 16],
             access_key: [2u8; 24],
+            unsealed_size: 42,
         };
 
         let buf = rkyv_format::write_array(&request).unwrap();