Merge pull request #569 from mythi/PR-2021-010

sgx: update SGX SDK/DCAP versions
This commit is contained in:
Ed Bartosh 2021-02-18 10:58:45 +02:00 committed by GitHub
commit d0ab71c93a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 12 additions and 13 deletions

View File

@ -64,8 +64,7 @@ The component has the same basic dependancies as the
[generic plugin framework dependencies](../../README.md#about). [generic plugin framework dependencies](../../README.md#about).
The SGX device plugin requires Linux Kernel SGX drivers to be available. These drivers The SGX device plugin requires Linux Kernel SGX drivers to be available. These drivers
are currently available via [RFC patches on Linux Kernel Mailing List](https://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-sgx.git). are available in Linux 5.11.
RFC *v41* was used to validate what is written in this document.
The hardware platform must support SGX Flexible Launch Control. The hardware platform must support SGX Flexible Launch Control.

View File

@ -23,8 +23,8 @@ RUN apt-get update && \
# SGX SDK is installed in /opt/intel directory. # SGX SDK is installed in /opt/intel directory.
WORKDIR /opt/intel WORKDIR /opt/intel
ARG SGX_SDK_INSTALLER=sgx_linux_x64_sdk_2.12.100.3.bin ARG SGX_SDK_INSTALLER=sgx_linux_x64_sdk_2.13.100.4.bin
ARG DCAP_VERSION=DCAP_1.9 ARG DCAP_VERSION=DCAP_1.10
RUN echo "deb [arch=amd64] https://download.01.org/intel-sgx/sgx_repo/ubuntu bionic main" >> /etc/apt/sources.list.d/intel-sgx.list \ RUN echo "deb [arch=amd64] https://download.01.org/intel-sgx/sgx_repo/ubuntu bionic main" >> /etc/apt/sources.list.d/intel-sgx.list \
&& wget -qO - https://download.01.org/intel-sgx/sgx_repo/ubuntu/intel-sgx-deb.key | apt-key add - \ && wget -qO - https://download.01.org/intel-sgx/sgx_repo/ubuntu/intel-sgx-deb.key | apt-key add - \
@ -35,7 +35,7 @@ RUN echo "deb [arch=amd64] https://download.01.org/intel-sgx/sgx_repo/ubuntu bio
libsgx-quote-ex-dev libsgx-quote-ex-dev
# Install SGX SDK # Install SGX SDK
RUN wget https://download.01.org/intel-sgx/sgx-linux/2.12/distro/ubuntu18.04-server/$SGX_SDK_INSTALLER \ RUN wget https://download.01.org/intel-sgx/sgx-linux/2.13/distro/ubuntu18.04-server/$SGX_SDK_INSTALLER \
&& chmod +x $SGX_SDK_INSTALLER \ && chmod +x $SGX_SDK_INSTALLER \
&& echo "yes" | ./$SGX_SDK_INSTALLER \ && echo "yes" | ./$SGX_SDK_INSTALLER \
&& rm $SGX_SDK_INSTALLER && rm $SGX_SDK_INSTALLER

View File

@ -9,4 +9,4 @@ spec:
provisionLimit: 110 provisionLimit: 110
logLevel: 4 logLevel: 4
nodeSelector: nodeSelector:
feature.node.kubernetes.io/sgx: 'true' feature.node.kubernetes.io/custom-intel.sgx: 'true'

View File

@ -1,2 +1,2 @@
PCCS_URL=https://localhost:8081/sgx/certification/v2/ PCCS_URL=https://localhost:8081/sgx/certification/v3/
USE_SECURE_CERT=FALSE USE_SECURE_CERT=FALSE

View File

@ -1,2 +1,2 @@
PCCS_URL=https://localhost:8081/sgx/certification/v2/ PCCS_URL=https://localhost:8081/sgx/certification/v3/
USE_SECURE_CERT=FALSE USE_SECURE_CERT=FALSE

View File

@ -1,6 +1,6 @@
sources: sources:
cpu: custom:
cpuid: - name: "intel.sgx"
attributeWhitelist: matchOn:
- "SGX" - kConfig: ["X86_SGX"]
- "SGXLC" cpuId: ["SGX", "SGXLC"]