OE 0.13 rc2 (#2014)

.azure-pipelines-gh-pages.yml

@@ -7,7 +7,7 @@ trigger:
 
 jobs:
   - job: build_and_publish_docs
-    container: ccfciteam/ccf-ci:oe0.12.0
+    container: ccfciteam/ccf-ci:oe0.13.0rc2
     pool:
       vmImage: ubuntu-18.04
 

.azure-pipelines.yml

@@ -25,11 +25,11 @@ schedules:
 resources:
   containers:
     - container: nosgx
-      image: ccfciteam/ccf-ci:oe0.12.0
+      image: ccfciteam/ccf-ci:oe0.13.0rc2
       options: --publish-all --cap-add SYS_PTRACE -v /dev/shm:/tmp/ccache -v /lib/modules:/lib/modules:ro
 
     - container: sgx
-      image: ccfciteam/ccf-ci:oe0.12.0
+      image: ccfciteam/ccf-ci:oe0.13.0rc2
       options: --publish-all --device /dev/sgx:/dev/sgx -v /dev/shm:/tmp/ccache -v /lib/modules:/lib/modules:ro
 
 variables:

.daily.yml

@@ -21,11 +21,11 @@ schedules:
 resources:
   containers:
     - container: nosgx
-      image: ccfciteam/ccf-ci:oe0.12.0
+      image: ccfciteam/ccf-ci:oe0.13.0rc2
       options: --publish-all --cap-add SYS_PTRACE -v /dev/shm:/tmp/ccache
 
     - container: sgx
-      image: ccfciteam/ccf-ci:oe0.12.0
+      image: ccfciteam/ccf-ci:oe0.13.0rc2
       options: --publish-all --device /dev/sgx:/dev/sgx -v /dev/shm:/tmp/ccache
 
 jobs:

.stress.yml

@@ -20,7 +20,7 @@ schedules:
 resources:
   containers:
     - container: sgx
-      image: ccfciteam/ccf-ci:oe0.12.0
+      image: ccfciteam/ccf-ci:oe0.13.0rc2
       options: --publish-all --device /dev/sgx:/dev/sgx -v /dev/shm:/tmp/ccache
 
 jobs:

CHANGELOG.md

@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 - Error responses of built-in endpoints are now JSON and follow the OData schema (#1919).
 - Code ids are now deleted rather than marked as `RETIRED`. `ACTIVE` is replaced with the more precise `ALLOWED_TO_JOIN`. (#1996)
+- CCF now depends on [Open Enclave 0.13](https://github.com/openenclave/openenclave/releases/tag/v0.13.0-rc2).
 
 ## [0.16.0]
 

cmake/ccf_app.cmake

@@ -35,27 +35,33 @@ find_package(OpenEnclave 0.10 CONFIG REQUIRED)
 # used for our edge cases (eg - for virtual libraries). These do not follow the
 # standard naming patterns, for example use OE_INCLUDEDIR rather than
 # OpenEnclave_INCLUDE_DIRS
+set(OE_CRYPTO_LIB
+    mbedtls
+    CACHE STRING "Crypto library used by enclaves."
+)
 
 option(LVI_MITIGATIONS "Enable LVI mitigations" ON)
 if(LVI_MITIGATIONS)
   set(OE_TARGET_LIBC openenclave::oelibc-lvi-cfg)
   set(OE_TARGET_ENCLAVE_AND_STD
-      openenclave::oeenclave-lvi-cfg openenclave::oelibcxx-lvi-cfg
-      openenclave::oelibc-lvi-cfg
+      openenclave::oeenclave-lvi-cfg openenclave::oecryptombedtls-lvi-cfg
+      openenclave::oelibcxx-lvi-cfg openenclave::oelibc-lvi-cfg
   )
   set(OE_TARGET_ENCLAVE_CORE_LIBS
-      openenclave::oeenclave-lvi-cfg openenclave::oesnmalloc-lvi-cfg
-      openenclave::oecore-lvi-cfg openenclave::oesyscall-lvi-cfg
+      openenclave::oeenclave-lvi-cfg openenclave::oecryptombedtls-lvi-cfg
+      openenclave::oesnmalloc-lvi-cfg openenclave::oecore-lvi-cfg
+      openenclave::oesyscall-lvi-cfg
   )
 else()
   set(OE_TARGET_LIBC openenclave::oelibc)
-  set(OE_TARGET_ENCLAVE_AND_STD openenclave::oeenclave openenclave::oelibcxx
-                                openenclave::oelibc
+  set(OE_TARGET_ENCLAVE_AND_STD
+      openenclave::oeenclave openenclave::oecryptombedtls openenclave::oelibcxx
+      openenclave::oelibc
   )
   # These oe libraries must be linked in specific order
   set(OE_TARGET_ENCLAVE_CORE_LIBS
-      openenclave::oeenclave openenclave::oesnmalloc openenclave::oecore
-      openenclave::oesyscall
+      openenclave::oeenclave openenclave::oecryptombedtls
+      openenclave::oesnmalloc openenclave::oecore openenclave::oesyscall
   )
 endif()
 

cmake/cpack_settings.cmake

@@ -11,7 +11,7 @@ set(CPACK_PACKAGING_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
 
 # CPack variables for Debian packages
 set(CPACK_DEBIAN_PACKAGE_DEPENDS
-    "open-enclave (>=0.12.0), libuv1 (>= 1.18.0), libc++1-8, libc++abi1-8"
+    "open-enclave (>=0.13.0), libuv1 (>= 1.18.0), libc++1-8, libc++abi1-8"
 )
 set(CPACK_DEBIAN_FILE_NAME DEB-DEFAULT)
 

getting_started/setup_vm/roles/intel/vars/common.yml

@@ -3,8 +3,8 @@
 
 ---
 flc_enabled: true
-intel_sgx_w_flc_driver_url: "https://download.01.org/intel-sgx/sgx-dcap/1.8/linux/distro/ubuntu18.04-server/sgx_linux_x64_driver_1.36.bin"
-intel_sgx1_driver_url: "https://download.01.org/intel-sgx/sgx-linux/2.11/distro/ubuntu18.04-server/sgx_linux_x64_driver_1.36.bin"
+intel_sgx_w_flc_driver_url: "https://download.01.org/intel-sgx/sgx-dcap/1.9/linux/distro/ubuntu18.04-server/sgx_linux_x64_driver_1.36.2.bin"
+intel_sgx1_driver_url: "https://download.01.org/intel-sgx/sgx-linux/2.12/distro/ubuntu18.04-server/sgx_linux_x64_driver_1.36.2.bin"
 
 intel_sgx_packages:
   - "libsgx-enclave-common"

getting_started/setup_vm/roles/openenclave/vars/common.yml

@@ -1,6 +1,6 @@
-oe_ver: "0.12.0"
+oe_ver: "0.13.0-rc2"
 # Usually the same, except for rc, where ver is -rc and ver_ is _rc
-oe_ver_: "0.12.0"
+oe_ver_: "0.13.0_rc2"
 
 # Source install
 workspace: "/tmp/"