From 58056e7ec4c7506ff9326db2e9c2279baaf31380 Mon Sep 17 00:00:00 2001
From: Mohsen Zohrevandi <mohsen.zohrevandi@fortanix.com>
Date: Tue, 16 Aug 2022 13:13:23 -0700
Subject: [PATCH] Update fortanix-sgx-abi dependency and restore path
 dependencies

---
 Cargo.lock                           | 10 ++--------
 intel-sgx/async-usercalls/Cargo.toml |  2 +-
 intel-sgx/enclave-runner/Cargo.toml  |  2 +-
 ipc-queue/Cargo.toml                 |  2 +-
 4 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e12c9e0e..d47c1658 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -938,7 +938,7 @@ dependencies = [
  "failure",
  "failure_derive",
  "fnv",
- "fortanix-sgx-abi 0.4.1",
+ "fortanix-sgx-abi",
  "futures 0.3.17",
  "ipc-queue",
  "lazy_static",
@@ -1138,12 +1138,6 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 
-[[package]]
-name = "fortanix-sgx-abi"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "816a38bd53bd5c87dd7edf4f15a2ee6b989ad7a5b5e616b75d70de64ad2a1329"
-
 [[package]]
 name = "fortanix-sgx-abi"
 version = "0.5.0"
@@ -1753,7 +1747,7 @@ dependencies = [
 name = "ipc-queue"
 version = "0.2.0"
 dependencies = [
- "fortanix-sgx-abi 0.4.1",
+ "fortanix-sgx-abi",
  "futures 0.3.17",
  "static_assertions",
  "tokio 0.2.22",
diff --git a/intel-sgx/async-usercalls/Cargo.toml b/intel-sgx/async-usercalls/Cargo.toml
index 1efbc98f..c8f22534 100644
--- a/intel-sgx/async-usercalls/Cargo.toml
+++ b/intel-sgx/async-usercalls/Cargo.toml
@@ -18,7 +18,7 @@ categories = ["asynchronous"]
 [dependencies]
 # Project dependencies
 ipc-queue = { version = "0.2", path = "../../ipc-queue" }
-fortanix-sgx-abi = { version = "0.4", path = "../fortanix-sgx-abi" }
+fortanix-sgx-abi = { version = "0.5.0", path = "../fortanix-sgx-abi" }
 
 # External dependencies
 lazy_static = "1.4.0"     # MIT/Apache-2.0
diff --git a/intel-sgx/enclave-runner/Cargo.toml b/intel-sgx/enclave-runner/Cargo.toml
index 0002469e..11fe0ed4 100644
--- a/intel-sgx/enclave-runner/Cargo.toml
+++ b/intel-sgx/enclave-runner/Cargo.toml
@@ -21,7 +21,7 @@ exclude = ["fake-vdso/.gitignore", "fake-vdso/Makefile", "fake-vdso/main.S"]
 [dependencies]
 # Project dependencies
 sgxs = { version = "0.7.2", path = "../sgxs" }
-fortanix-sgx-abi = { version = "0.4.0" } # TODO: add back `path = "../fortanix-sgx-abi"`
+fortanix-sgx-abi = { version = "0.5.0", path = "../fortanix-sgx-abi" }
 sgx-isa = { version = "0.4.0", path = "../sgx-isa" }
 ipc-queue = { version = "0.2.0", path = "../../ipc-queue" }
 
diff --git a/ipc-queue/Cargo.toml b/ipc-queue/Cargo.toml
index a5e8c1b5..2a4d1cd7 100644
--- a/ipc-queue/Cargo.toml
+++ b/ipc-queue/Cargo.toml
@@ -14,7 +14,7 @@ keywords = ["sgx", "fifo", "queue", "ipc"]
 categories = ["asynchronous"]
 
 [dependencies]
-fortanix-sgx-abi = { version = "0.4.0" } # TODO: add back `path = "../intel-sgx/fortanix-sgx-abi"`
+fortanix-sgx-abi = { version = "0.5.0", path = "../intel-sgx/fortanix-sgx-abi" }
 
 [dev-dependencies]
 static_assertions = "1.1.0"