diff --git a/Cargo.lock b/Cargo.lock index c6561a04af..245a35d089 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3176,6 +3176,7 @@ dependencies = [ "mc-api", "mc-attest-api", "mc-attest-core", + "mc-attest-enclave-api", "mc-consensus-api", "mc-crypto-keys", "mc-fog-enclave-connection", @@ -4216,11 +4217,17 @@ dependencies = [ name = "mc-fog-view-connection" version = "2.0.0" dependencies = [ + "aes-gcm", + "futures", "grpcio", + "mc-attest-ake", + "mc-attest-api", "mc-attest-core", "mc-attest-verifier", "mc-common", "mc-crypto-keys", + "mc-crypto-noise", + "mc-crypto-rand", "mc-fog-api", "mc-fog-enclave-connection", "mc-fog-types", @@ -4229,7 +4236,10 @@ dependencies = [ "mc-util-grpc", "mc-util-serial", "mc-util-telemetry", + "mc-util-uri", "retry", + "sha2 0.10.6", + "tokio", ] [[package]] @@ -4242,6 +4252,7 @@ dependencies = [ "mc-attest-enclave-api", "mc-attest-verifier", "mc-common", + "mc-crypto-ake-enclave", "mc-crypto-keys", "mc-enclave-boundary", "mc-fog-ocall-oram-storage-edl", @@ -4275,7 +4286,9 @@ dependencies = [ "mc-attest-core", "mc-attest-enclave-api", "mc-common", + "mc-crypto-ake-enclave", "mc-crypto-keys", + "mc-crypto-noise", "mc-fog-recovery-db-iface", "mc-fog-types", "mc-sgx-compat", @@ -4297,7 +4310,10 @@ dependencies = [ name = "mc-fog-view-enclave-impl" version = "2.0.0" dependencies = [ + "aes-gcm", "aligned-cmov", + "itertools", + "mc-attest-ake", "mc-attest-core", "mc-attest-enclave-api", "mc-common", @@ -4379,9 +4395,11 @@ dependencies = [ "futures", "grpcio", "hex", + "itertools", "lazy_static", "mc-attest-api", "mc-attest-core", + "mc-attest-enclave-api", "mc-attest-net", "mc-attest-verifier", "mc-blockchain-types", @@ -5594,24 +5612,14 @@ dependencies = [ [[package]] name = "mio" -version = "0.7.14" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc" +checksum = "57ee1c23c7c63b0c9250c339ffdc69255f110b298b901b9f6c82547b7b87caaf" dependencies = [ "libc", "log", - "miow", - "ntapi", - "winapi", -] - -[[package]] -name = "miow" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" -dependencies = [ - "winapi", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys", ] [[package]] @@ -5694,15 +5702,6 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" -[[package]] -name = "ntapi" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44" -dependencies = [ - "winapi", -] - [[package]] name = "num-bigint" version = "0.2.6" @@ -7509,9 +7508,9 @@ checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" [[package]] name = "socket2" -version = "0.4.2" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dc90fe6c7be1a323296982db1836d1ea9e47b6839496dde9a541bc496df3516" +checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" dependencies = [ "libc", "winapi", @@ -7800,18 +7799,20 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.16.1" +version = "1.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c27a64b625de6d309e8c57716ba93021dccf1b3b5c97edd6d3dd2d2135afc0a" +checksum = "a9e03c497dc955702ba729190dc4aac6f2a0ce97f913e5b1b5912fc5039d9099" dependencies = [ + "autocfg", "bytes 1.1.0", "libc", "memchr", "mio", "num_cpus", - "once_cell", + "parking_lot 0.12.0", "pin-project-lite", "signal-hook-registry", + "socket2", "tokio-macros", "winapi", ] diff --git a/crypto/ake/enclave/src/lib.rs b/crypto/ake/enclave/src/lib.rs index fb86625167..009ce4fbe0 100644 --- a/crypto/ake/enclave/src/lib.rs +++ b/crypto/ake/enclave/src/lib.rs @@ -38,7 +38,7 @@ const MAX_AUTH_PENDING_REQUESTS: usize = 64; const MAX_PEER_SESSIONS: usize = 64; /// Maximum number of concurrent sessions to this enclave from router enclaves. -const MAX_FRONTEND_SESSIONS: usize = 10_000; +const MAX_FRONTEND_SESSIONS: usize = 500; /// Max number of backends that this enclave can connect to as a client. const MAX_BACKEND_SESSIONS: usize = 10_000;