Skip to content

sgx: update SGX SDK/DCAP versions #569

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 18, 2021
Merged

sgx: update SGX SDK/DCAP versions #569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions cmd/sgx_plugin/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,7 @@ The component has the same basic dependancies as the
[generic plugin framework dependencies](../../README.md#about).

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).
RFC *v41* was used to validate what is written in this document.
are available in Linux 5.11.

The hardware platform must support SGX Flexible Launch Control.

Expand Down
6 changes: 3 additions & 3 deletions demo/sgx-sdk-demo/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ RUN apt-get update && \
# SGX SDK is installed in /opt/intel directory.
WORKDIR /opt/intel

ARG SGX_SDK_INSTALLER=sgx_linux_x64_sdk_2.12.100.3.bin
ARG DCAP_VERSION=DCAP_1.9
ARG SGX_SDK_INSTALLER=sgx_linux_x64_sdk_2.13.100.4.bin
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 \
&& wget -qO - https://download.01.org/intel-sgx/sgx_repo/ubuntu/intel-sgx-deb.key | apt-key add - \
Expand All @@ -35,7 +35,7 @@ RUN echo "deb [arch=amd64] https://download.01.org/intel-sgx/sgx_repo/ubuntu bio
libsgx-quote-ex-dev

# 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 \
&& echo "yes" | ./$SGX_SDK_INSTALLER \
&& rm $SGX_SDK_INSTALLER
Expand Down
2 changes: 1 addition & 1 deletion deployments/operator/samples/deviceplugin_v1_sgxdeviceplugin.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ spec:
provisionLimit: 110
logLevel: 4
nodeSelector:
feature.node.kubernetes.io/sgx: 'true'
feature.node.kubernetes.io/custom-intel.sgx: 'true'
2 changes: 1 addition & 1 deletion deployments/sgx_aesmd/base/sgx_default_qcnl.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
PCCS_URL=https://localhost:8081/sgx/certification/v2/
PCCS_URL=https://localhost:8081/sgx/certification/v3/
USE_SECURE_CERT=FALSE
2 changes: 1 addition & 1 deletion deployments/sgx_enclave_apps/overlays/sgx_ecdsa_inproc_quote/sgx_default_qcnl.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
PCCS_URL=https://localhost:8081/sgx/certification/v2/
PCCS_URL=https://localhost:8081/sgx/certification/v3/
USE_SECURE_CERT=FALSE
10 changes: 5 additions & 5 deletions deployments/sgx_nfd/nfd-worker.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
sources:
cpu:
cpuid:
attributeWhitelist:
- "SGX"
- "SGXLC"
custom:
- name: "intel.sgx"
matchOn:
- kConfig: ["X86_SGX"]
cpuId: ["SGX", "SGXLC"]