From 7286c0c02c37052cb9ed428b2ff0023c28c267c7 Mon Sep 17 00:00:00 2001 From: "zongmin.gu" Date: Fri, 13 Aug 2021 12:02:37 +0800 Subject: [PATCH] Update with SGX SDK 2.14 --- .gitmodules | 1 - deps/rust-sgx-sdk | 2 +- tools/docker/Dockerfile.aliyunlinux3 | 4 ++-- tools/docker/Dockerfile.centos8.2 | 7 ++----- tools/docker/Dockerfile.ubuntu18.04 | 6 +++--- 5 files changed, 8 insertions(+), 12 deletions(-) diff --git a/.gitmodules b/.gitmodules index 4ffe9d8f..02f126f5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,6 @@ [submodule "deps/rust-sgx-sdk"] path = deps/rust-sgx-sdk url = https://github.com/occlum/incubator-teaclave-sgx-sdk.git - branch = sgx_2.13_for_occlum [submodule "deps/sefs"] path = deps/sefs url = https://github.com/occlum/sefs.git diff --git a/deps/rust-sgx-sdk b/deps/rust-sgx-sdk index 0b83e463..e61c9a5c 160000 --- a/deps/rust-sgx-sdk +++ b/deps/rust-sgx-sdk @@ -1 +1 @@ -Subproject commit 0b83e463d391048942d16f16d9da9b07225df749 +Subproject commit e61c9a5ce5e4a0161696e9c1a75807fef105c9aa diff --git a/tools/docker/Dockerfile.aliyunlinux3 b/tools/docker/Dockerfile.aliyunlinux3 index b3492a51..dabebee0 100644 --- a/tools/docker/Dockerfile.aliyunlinux3 +++ b/tools/docker/Dockerfile.aliyunlinux3 @@ -76,7 +76,7 @@ RUN yum install -y --nogpgcheck \ # Install PSW and DCAP RPM packages WORKDIR /tmp -RUN wget https://mirrors.openanolis.cn/inclavare-containers/alinux3/sgx-2.13/sgx_rpm_local_repo.tar.gz && \ +RUN wget https://mirrors.openanolis.cn/inclavare-containers/alinux3/sgx-2.14/sgx_rpm_local_repo.tar.gz && \ tar -xzf sgx_rpm_local_repo.tar.gz && \ rm -f sgx_rpm_local_repo.tar.gz && \ cd /tmp/sgx_rpm_local_repo && \ @@ -106,7 +106,7 @@ RUN wget https://mirrors.openanolis.cn/inclavare-containers/alinux3/sgx-2.13/sgx # Install SGX SDK WORKDIR /tmp -RUN git clone -b sgx_2.13.3_for_occlum https://github.com/occlum/linux-sgx && \ +RUN git clone -b sgx_2.14_for_occlum https://github.com/occlum/linux-sgx && \ cd linux-sgx && \ make preparation && \ ./compile_and_install.sh no_mitigation USE_OPT_LIBS=2 && \ diff --git a/tools/docker/Dockerfile.centos8.2 b/tools/docker/Dockerfile.centos8.2 index 02b0c712..693068dd 100644 --- a/tools/docker/Dockerfile.centos8.2 +++ b/tools/docker/Dockerfile.centos8.2 @@ -71,10 +71,7 @@ RUN curl https://sh.rustup.rs -sSf | \ # Install SGX PSW WORKDIR /tmp RUN echo "ca_directory=/etc/ssl/certs" >> /etc/wgetrc && \ - wget https://download.01.org/intel-sgx/sgx-linux/2.13.3/distro/centos8.2-server/sgx_rpm_local_repo.tgz && \ - tar -xvf sgx_rpm_local_repo.tgz && \ - rm sgx_rpm_local_repo.tgz && \ - wget https://download.01.org/intel-sgx/sgx-dcap/1.10.3/linux/distro/centos8.2-server/sgx_rpm_local_repo.tgz && \ + wget https://download.01.org/intel-sgx/sgx-linux/2.14/distro/centos8.2-server/sgx_rpm_local_repo.tgz && \ tar -xvf sgx_rpm_local_repo.tgz && \ rm sgx_rpm_local_repo.tgz && \ cd /tmp/sgx_rpm_local_repo && \ @@ -104,7 +101,7 @@ RUN echo "ca_directory=/etc/ssl/certs" >> /etc/wgetrc && \ # Install SGX SDK WORKDIR /tmp -RUN git clone -b sgx_2.13.3_for_occlum https://github.com/occlum/linux-sgx && \ +RUN git clone -b sgx_2.14_for_occlum https://github.com/occlum/linux-sgx && \ cd linux-sgx && \ make preparation && \ ./compile_and_install.sh no_mitigation USE_OPT_LIBS=2 && \ diff --git a/tools/docker/Dockerfile.ubuntu18.04 b/tools/docker/Dockerfile.ubuntu18.04 index d895e2c1..be930bff 100644 --- a/tools/docker/Dockerfile.ubuntu18.04 +++ b/tools/docker/Dockerfile.ubuntu18.04 @@ -84,8 +84,8 @@ RUN curl https://sh.rustup.rs -sSf | \ cargo -V # Install SGX PSW -ARG PSW_VERSION=2.13.103.1 -ARG DCAP_VERSION=1.10.103.1 +ARG PSW_VERSION=2.14.100.2 +ARG DCAP_VERSION=1.11.100.2 RUN apt-get update && aptitude install -y \ libsgx-launch-dev=$PSW_VERSION-bionic1 \ libsgx-epid-dev=$PSW_VERSION-bionic1 \ @@ -120,7 +120,7 @@ RUN apt-get update && aptitude install -y \ # Install SGX SDK WORKDIR /tmp -RUN git clone -b sgx_2.13.3_for_occlum https://github.com/occlum/linux-sgx && \ +RUN git clone -b sgx_2.14_for_occlum https://github.com/occlum/linux-sgx && \ mkdir /etc/init && \ cd linux-sgx && \ make preparation && \