From bf44334576f61b366044a23d9cb32a1c3b4da3f2 Mon Sep 17 00:00:00 2001
From: Adrian Cruceru <cruceruadrian@gmail.com>
Date: Tue, 5 May 2020 14:55:34 +0200
Subject: [PATCH] Update fortanix-sgx-tools version due to libunwind update
 Update aesm-client version due to ECDSA operations

---
 Cargo.lock                    |  4 ++--
 aesm-client/Cargo.toml        |  2 +-
 doc/FORTANIX-SGX-ABI.md       | 14 ++++++++++++++
 fortanix-sgx-tools/Cargo.toml |  2 +-
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 2ad1b807e..4eba590c2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8,7 +8,7 @@ checksum = "5d2e7343e7fc9de883d1b0341e0b13970f764c14101234857d2ddafa1cb1cac2"
 
 [[package]]
 name = "aesm-client"
-version = "0.4.0"
+version = "0.4.1"
 dependencies = [
  "byteorder",
  "failure",
@@ -648,7 +648,7 @@ dependencies = [
 
 [[package]]
 name = "fortanix-sgx-tools"
-version = "0.3.1"
+version = "0.4.0"
 dependencies = [
  "aesm-client",
  "clap",
diff --git a/aesm-client/Cargo.toml b/aesm-client/Cargo.toml
index 12a3f48f7..ce649759e 100644
--- a/aesm-client/Cargo.toml
+++ b/aesm-client/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "aesm-client"
-version = "0.4.0"
+version = "0.4.1"
 authors = ["Fortanix, Inc."]
 license = "MPL-2.0"
 description = """
diff --git a/doc/FORTANIX-SGX-ABI.md b/doc/FORTANIX-SGX-ABI.md
index 154d11ef3..998915bb0 100644
--- a/doc/FORTANIX-SGX-ABI.md
+++ b/doc/FORTANIX-SGX-ABI.md
@@ -2,6 +2,16 @@
 
 This document describes the ABI of SGX enclaves built using `libenclave`.
 
+## elf2sgxs compatibility
+
+rust-lang toolchain version is defined as description for '.note.x86_64-fortanix-unknown-sgx' assembly section.
+
+| rust-lang toolchain version | fortanix-sgx-tools version | 
+| ---------------------------:| --------------------------:|
+|             1               |          0.4.0             |
+|             0               |          0.3.1             |
+
+
 ## ABI version compatibility
 
 | ABI version | Rust std version | enclave-runner version |
@@ -20,6 +30,10 @@ This document describes the ABI of SGX enclaves built using `libenclave`.
 
 ## Changelog
 
+### Version 0.4.0
+
+* Added support for new rust-lang toolchain which fixes: https://github.com/fortanix/rust-sgx/issues/174
+
 ### Version 0.3.2
 
 * *No semantic changes.*
diff --git a/fortanix-sgx-tools/Cargo.toml b/fortanix-sgx-tools/Cargo.toml
index ac3c5b692..799770593 100644
--- a/fortanix-sgx-tools/Cargo.toml
+++ b/fortanix-sgx-tools/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "fortanix-sgx-tools"
-version = "0.3.1"
+version = "0.4.0"
 authors = ["Fortanix, Inc."]
 license = "MPL-2.0"
 description = """