fix compiler error on sealing and examples (#3)

Reviewed-on: SGX/detee-sgx#3
Reviewed-by: Valentyn Faychuk <valy@detee.ltd>
Co-authored-by: Noor <noormohammedb@protonmail.com>
Co-committed-by: Noor <noormohammedb@protonmail.com>

examples/mratls_grpcs_client.rs

@@ -2,10 +2,10 @@ pub mod pb {
     tonic::include_proto!("/grpc.examples.unaryecho");
 }
 
+use detee_sgx::prelude::*;
+use detee_sgx::RaTlsConfigBuilder;
 use hyper::Uri;
 use hyper_util::{client::legacy::connect::HttpConnector, rt::TokioExecutor};
-use occlum_ratls::prelude::*;
-use occlum_ratls::RaTlsConfigBuilder;
 use pb::{echo_client::EchoClient, EchoRequest};
 use tokio_rustls::rustls::ClientConfig;
 

examples/mratls_grpcs_server.rs

@@ -2,6 +2,8 @@ pub mod pb {
     tonic::include_proto!("/grpc.examples.unaryecho");
 }
 
+use detee_sgx::prelude::*;
+use detee_sgx::RaTlsConfigBuilder;
 use hyper::server::conn::http2::Builder;
 use hyper_util::{
     rt::{TokioExecutor, TokioIo},
@@ -19,9 +21,6 @@ use tonic::{body::boxed, service::Routes, Request, Response, Status};
 use tower::ServiceBuilder;
 use tower::ServiceExt;
 
-use occlum_ratls::prelude::*;
-use occlum_ratls::RaTlsConfigBuilder;
-
 use std::sync::atomic::{AtomicUsize, Ordering};
 static COUNTER: AtomicUsize = AtomicUsize::new(0);
 

examples/mratls_https_client.rs

@@ -1,4 +1,4 @@
-use occlum_ratls::prelude::*;
+use detee_sgx::prelude::*;
 use reqwest::ClientBuilder;
 
 #[tokio::main]

examples/mratls_https_server.rs

@@ -1,5 +1,5 @@
 use actix_web::{get, App, HttpServer};
-use occlum_ratls::prelude::*;
+use detee_sgx::prelude::*;
 use std::net::SocketAddr;
 
 #[get("/")]

examples/sealing.rs

@@ -1,4 +1,4 @@
-use occlum_ratls::prelude::*;
+use detee_sgx::prelude::*;
 use std::{
     fs,
     path::Path,
@@ -9,7 +9,7 @@ const DATA_PATH: &str = "/host/sealed_data";
 
 fn main() {
     println!("Example of sealing");
-    let sgx_sealing = SgxSealing::new().unwrap();
+    let sgx_sealing = SealingConfig::new().unwrap();
     println!("sealing : {:?}", sgx_sealing);
 
     let timestamp = SystemTime::now()
@@ -35,13 +35,13 @@ fn main() {
     }
 }
 
-fn seal_and_write_data(sgx_sealing: SgxSealing, payload: Vec<u8>) {
+fn seal_and_write_data(sgx_sealing: SealingConfig, payload: Vec<u8>) {
     let sealed_data = sgx_sealing.seal_data(payload).unwrap();
     println!("sealed_data: {:?}", &sealed_data);
     fs::write(DATA_PATH, &sealed_data).expect("Failed to write file {DATA_PATH}");
 }
 
-fn unseal_data(sgx_sealing: SgxSealing, sealed_data: Vec<u8>) {
+fn unseal_data(sgx_sealing: SealingConfig, sealed_data: Vec<u8>) {
     println!("sealed_data: {:?}", &sealed_data);
     let unsealed_data = sgx_sealing.un_seal_data(sealed_data).unwrap();
     println!("unsealed_data: {:?}", &unsealed_data);

src/lib.rs

@@ -25,7 +25,7 @@ mod sealing;
 
 pub use crate::config::RaTlsConfig;
 #[cfg(feature = "sealing")]
-pub use crate::sealing::SgxSealing;
+pub use crate::sealing::SealingConfig;
 
 #[cfg(feature = "occlum")]
 pub use crate::config::InstanceMeasurement;

src/prelude.rs

@@ -1,6 +1,6 @@
 pub use crate::RaTlsConfig;
 #[cfg(feature = "sealing")]
-pub use crate::SgxSealing;
+pub use crate::SealingConfig;
 
 #[cfg(feature = "occlum")]
 pub use crate::config::InstanceMeasurement;

src/sealing/decrypt.rs

@@ -1,9 +1,9 @@
 use aes_gcm::{aead::Aead, Aes256Gcm, Key, KeyInit, Nonce};
 
-use super::SgxSealing;
+use crate::SealingConfig;
 use crate::SgxError;
 
-impl SgxSealing {
+impl SealingConfig {
     pub fn un_seal_data(self, payload_encrypted_packet: Vec<u8>) -> Result<Vec<u8>, SgxError> {
         let sealing_key = self.get_aes256_sealing_key()?;
 

src/sealing/encrypt.rs

@@ -3,10 +3,10 @@ use aes_gcm::{
     Aes256Gcm, Key, KeyInit,
 };
 
-use super::SgxSealing;
+use crate::SealingConfig;
 use crate::SgxError;
 
-impl SgxSealing {
+impl SealingConfig {
     pub fn seal_data(self, payload_plain_text: Vec<u8>) -> Result<Vec<u8>, SgxError> {
         let sealing_key = self.get_aes256_sealing_key()?;
 

src/sealing/key_derivation.rs

@@ -1,12 +1,12 @@
 use pbkdf2::pbkdf2_hmac_array;
 use sha2::Sha256;
 
-use super::SgxSealing;
+use crate::SealingConfig;
 use crate::SgxError;
 
 pub type SealingKey256BitDerived = [u8; 32];
 
-impl SgxSealing {
+impl SealingConfig {
     pub fn get_aes256_sealing_key(self) -> Result<SealingKey256BitDerived, SgxError> {
         let mrsigner_for_salt = Self::get_current_sgx_quote()?.mrsigner().m;
 

src/sealing/mod.rs

@@ -2,7 +2,7 @@ mod decrypt;
 mod encrypt;
 pub mod key_derivation;
 pub mod sealing_config;
-pub mod sealing_error;
+// pub mod sealing_error;
 
 pub use sealing_config::SealingConfig;
-pub use sealing_error::SealingError;
+// pub use sealing_error::SealingError;

src/sealing/sealing_config.rs

@@ -18,12 +18,12 @@ pub enum SealingKeyPolicy {
 pub type Sgx128BitKey = sgx_key_128bit_t;
 
 #[derive(Debug)]
-pub struct SgxSealing {
+pub struct SealingConfig {
     #[cfg(feature = "occlum")]
     pub sealing_key: Sgx128BitKey,
 }
 
-impl SgxSealing {
+impl SealingConfig {
     #[cfg(feature = "occlum")]
     pub(crate) fn get_current_sgx_quote() -> Result<&'static Quote, SgxError> {
         Ok(STATIC_QUOTE.as_ref().map_err(|e| e.clone())?)