fix: resolve rebase error

Author: Taowyoo

Cargo.lock

@@ -32,11 +32,11 @@ cfg-if = "1.0.0"
 tokio = { version = "0.3.4", optional = true }
 
 [target.x86_64-fortanix-unknown-sgx.dependencies]
-rs-libc = "0.1.0"
+rs-libc = "0.2.0"
 chrono = "0.4"
 
 [dependencies.mbedtls-sys-auto]
-version = "2.26.0"
+version = "2.28.0"
 default-features = false
 features = ["custom_printf", "trusted_cert_callback", "threading"]
 path = "../mbedtls-sys"
@@ -61,7 +61,7 @@ cc = "1.0"
 # Features are documented in the README
 default = ["std", "aesni", "time", "padlock"]
 std = ["byteorder/std", "mbedtls-sys-auto/std", "serde/std", "yasna"]
-debug = ["mbedtls-sys-auto/debug"]
+debug = []
 no_std_deps = ["spin", "serde/alloc"]
 force_aesni_support = ["mbedtls-sys-auto/custom_has_support", "mbedtls-sys-auto/aes_alt", "aesni"]
 mpi_force_c_code = ["mbedtls-sys-auto/mpi_force_c_code"]
@@ -118,11 +118,3 @@ required-features = ["std", "async-rt"]
 name = "async_session"
 path = "tests/async_session.rs"
 required-features = ["async-rt"]
-
-
-[package.metadata.fortanix-sgx]
-threads = 100
-heap-size = 0x40000000
-stack-size = 0x100000
-# The following are not processed by the EDP tools but are picked up by build-enclave.sh:
-#isvprodid = 66

mbedtls/Cargo.toml

@@ -1227,7 +1227,7 @@ iy6KC991zzvaWY/Ys+q/84Afqa+0qJKQnPuy/7F5GkVdQA/lfbhi
 
     #[test]
     fn rsa_sign_verify_pkcs1v15() {
-        let pk =
+        let mut pk =
             Pk::generate_rsa(&mut crate::test_support::rand::test_rng(), 2048, 0x10001).unwrap();
         let data = b"SIGNATURE TEST SIGNATURE TEST SIGNATURE TEST SIGNATURE TEST SIGN";
         let mut signature = vec![0u8; (pk.len() + 7) / 8];

mbedtls/src/pk/mod.rs

@@ -14,6 +14,14 @@ use {
     std::sync::Arc,
 };
 
+#[cfg(all(feature = "std", feature = "async"))]
+use {
+    std::io::ErrorKind as IoErrorKind,
+    std::marker::Unpin,
+    std::pin::Pin,
+    std::task::{Context as TaskContext, Poll},
+};
+
 use mbedtls_sys::types::raw_types::{c_int, c_uchar, c_void};
 use mbedtls_sys::types::size_t;
 use mbedtls_sys::*;
@@ -260,12 +268,11 @@ impl<T> Context<T> {
             client_transport_id: None,
         }
     }
-}
-
+    
     pub(crate) fn handle(&self) -> &::mbedtls_sys::ssl_context {
         self.inner.handle()
     }
-
+    
     pub(crate) fn handle_mut(&mut self) -> &mut ::mbedtls_sys::ssl_context {
         self.inner.handle_mut()
     }
@@ -551,6 +558,7 @@ impl<T: IoCallback + Write> Write for Context<T> {
         Ok(())
     }
 }
+
 //
 // Class exists only during SNI callback that is configured from Config.
 // SNI Callback must provide input whose lifetime exceeds the SNI closure to avoid memory corruptions.

mbedtls/src/ssl/context.rs

@@ -58,9 +58,9 @@ mod test {
     use std::thread;
     use crate::support::net::create_tcp_pair;
     use crate::support::keys;
-    use mbedtls::x509::{Certificate};
+    use mbedtls::x509::Certificate;
     use mbedtls::Error;
-    use mbedtls::alloc::{List as MbedtlsList, Box as MbedtlsBox};
+    use mbedtls::alloc::List as MbedtlsList;
 
     // This callback should accept any valid self-signed certificate
     fn self_signed_ca_callback(child: &MbedtlsList<Certificate>) -> TlsResult<MbedtlsList<Certificate>> {