Commit 2cc3f6e

authored

Upgrade to OE 0.17.1 (#257)

* done * Update CMakeLists.txt * Update CMakeLists.txt

1 parent 621c562 commit 2cc3f6eCopy full SHA for 2cc3f6e

File tree

-6

lines changed

-6

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ echo "deb [arch=amd64] https://packages.microsoft.com/ubuntu/18.04/prod bionic m`
`7`	`7`	`wget -qO - https://packages.microsoft.com/keys/microsoft.asc \| sudo apt-key add -`
`8`	`8`
`9`	`9`	`sudo apt-get update`
`10`		`-sudo apt-get -y install clang-7 libssl-dev gdb libsgx-enclave-common libsgx-enclave-common-dev libprotobuf10 libsgx-dcap-ql libsgx-dcap-ql-dev az-dcap-client open-enclave=0.12.0`
	`10`	`+sudo apt-get -y install clang-8 libssl-dev gdb libsgx-enclave-common libsgx-quote-ex libprotobuf10 libsgx-dcap-ql libsgx-dcap-ql-dev az-dcap-client open-enclave=0.17.1`
`11`	`11`
`12`	`12`	`# Install Opaque Dependencies`
`13`	`13`	`sudo apt-get -y install wget build-essential openjdk-8-jdk python libssl-dev libmbedtls-dev`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ Installing dependencies manually`
`21`	`21`
`22`	`22`	`After downloading the Opaque codebase, install necessary dependencies as follows.`
`23`	`23`
`24`		-1. Install dependencies and the `OpenEnclave SDK <https://github.com/openenclave/openenclave/blob/v0.12.0/docs/GettingStartedDocs/install_oe_sdk-Ubuntu_18.04.md>`_. We currently support OE version 0.12.0 (so please install with ``open-enclave=0.12.0``) and Ubuntu 18.04.
	`24`	+1. Install dependencies and the `OpenEnclave SDK <https://github.com/openenclave/openenclave/blob/v0.17.x/docs/GettingStartedDocs/install_oe_sdk-Ubuntu_18.04.md>`_. We currently support OE version 0.17.1 (so please install with ``open-enclave=0.17.1``) and Ubuntu 18.04.
`25`	`25`
`26`	`26`	`.. code-block:: bash`
`27`	`27`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ chmod +x sgx_linux_x64_driver_1.36.2.bin`
`22`	`22`	`sudo ./sgx_linux_x64_driver_1.36.2.bin`
`23`	`23`	`rm -rf sgx_linux_x64_driver_1.36.2.bin`
`24`	`24`
`25`		`-sudo apt -y install clang-7 libssl-dev gdb libsgx-enclave-common libprotobuf10 libsgx-dcap-ql libsgx-dcap-ql-dev az-dcap-client open-enclave=0.12.0`
	`25`	`+sudo apt -y install clang-8 libssl-dev gdb libsgx-enclave-common libsgx-quote-ex libprotobuf10 libsgx-dcap-ql libsgx-dcap-ql-dev az-dcap-client open-enclave=0.17.1`
`26`	`26`
`27`	`27`	`# Install SBT dependencies`
`28`	`28`	`sudo apt -y install wget build-essential openjdk-8-jdk python libssl-dev libmbedtls-dev`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,11 +8,11 @@ option(FLATBUFFERS_GEN_CPP_DIR "Location of Flatbuffers generated C++ files.")`
`8`	`8`
`9`	`9`	`set(CMAKE_CXX_STANDARD 11)`
`10`	`10`
`11`		`-set(OE_MIN_VERSION 0.12.0)`
	`11`	`+set(OE_MIN_VERSION 0.17.1)`
`12`	`12`	`find_package(OpenEnclave ${OE_MIN_VERSION} CONFIG REQUIRED)`
`13`	`13`
`14`	`14`	`set(OE_CRYPTO_LIB`
`15`		`- mbed`
	`15`	`+ mbedtls`
`16`	`16`	`CACHE STRING "Crypto library used by enclaves.")`
`17`	`17`
`18`	`18`	`include_directories(app)`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,6 @@`
`46`	`46`	`#include <cstdarg>`
`47`	`47`	`#include <cstdio>`
`48`	`48`	`#include <cstdlib>`
`49`		`-#include <openenclave/host.h>`
`50`	`49`	`#include <string>`
`51`	`50`	`#include <sys/time.h> // struct timeval`
`52`	`51`	`#include <time.h> // gettimeofday`

Comments

(0)