fix(rtc_types::enclave_messages): work around cbindgen generic type h…

…andling issues Issues: * mozilla/cbindgen#7 * mozilla/cbindgen#286 * mozilla/cbindgen#573
ntls-io · Jun 15, 2021 · 576cf49 · 576cf49
1 parent 25b471e
commit 576cf49
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/rtc_types/src/enclave_messages/mod.rs b/rtc_types/src/enclave_messages/mod.rs
@@ -11,5 +11,15 @@ pub struct EncryptedEnclaveMessage<const MESSAGE_SIZE: usize, const AAD_SIZE: us
     pub nonce: RecommendedAesGcmIv,
 }
 
-pub mod ffi_set_access_key;
+/// XXX: Ignore this module to work around cbindgen generic type handling
+///
+/// Issues:
+///
+/// * <https://github.com/eqrion/cbindgen/issues/7>
+/// * <https://github.com/eqrion/cbindgen/issues/286>
+/// * <https://github.com/eqrion/cbindgen/issues/573>
+///
+/// cbindgen:ignore
 pub mod set_access_key;
+
+pub mod ffi_set_access_key;
diff --git a/rtc_types/src/enclave_messages/set_access_key.rs b/rtc_types/src/enclave_messages/set_access_key.rs
@@ -2,7 +2,7 @@ use core::mem;
 
 use rkyv::{Archive, Deserialize, Serialize};
 
-use crate::enclave_messages::EncryptedEnclaveMessage;
+use crate::enclave_messages::{EncryptedEnclaveMessage, ARCHIVED_ENCLAVE_ID_SIZE};
 
 #[derive(Archive, Deserialize, Serialize, Debug, PartialEq, Clone)]
 pub struct Request {