Skip to content
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

Jump to bottom

Update SGX SDK to 2.20 #3617

Merged
merged 1 commit into from
Oct 17, 2023
Merged

Update SGX SDK to 2.20 #3617

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
26 changes: 13 additions & 13 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ permissions:
jobs:
build-dev:
runs-on: [self-hosted, Linux, large]
container: mobilecoin/builder-install:v0.0.27
container: mobilecoin/builder-install:v0.0.29

steps:
- name: Check out code
Expand All @@ -42,7 +42,7 @@ jobs:

build-prod:
runs-on: [self-hosted, Linux, large]
container: mobilecoin/builder-install:v0.0.27
container: mobilecoin/builder-install:v0.0.29

steps:
- name: Check out code
Expand All @@ -63,7 +63,7 @@ jobs:

build-and-test-wasm:
runs-on: [self-hosted, Linux, large]
container: mobilecoin/builder-install:v0.0.27
container: mobilecoin/builder-install:v0.0.29

steps:
- name: Check out code
Expand All @@ -78,7 +78,7 @@ jobs:

lint-rust:
runs-on: [self-hosted, Linux, large]
container: mobilecoin/builder-install:v0.0.27
container: mobilecoin/builder-install:v0.0.29

steps:
- name: Check out code
Expand All @@ -95,7 +95,7 @@ jobs:

build-and-test-go:
runs-on: [self-hosted, Linux, large]
container: mobilecoin/builder-install:v0.0.27
container: mobilecoin/builder-install:v0.0.29

steps:
- name: Check out code
Expand Down Expand Up @@ -129,7 +129,7 @@ jobs:

docs:
runs-on: [self-hosted, Linux, large]
container: mobilecoin/builder-install:v0.0.27
container: mobilecoin/builder-install:v0.0.29

steps:
- name: Check out code
Expand All @@ -148,7 +148,7 @@ jobs:

mc-tests:
runs-on: [self-hosted, Linux, large]
container: mobilecoin/builder-install:v0.0.27
container: mobilecoin/builder-install:v0.0.29

strategy:
matrix:
Expand Down Expand Up @@ -191,7 +191,7 @@ jobs:

consensus-tests:
runs-on: [self-hosted, Linux, large]
container: mobilecoin/builder-install:v0.0.27
container: mobilecoin/builder-install:v0.0.29

strategy:
matrix:
Expand Down Expand Up @@ -224,7 +224,7 @@ jobs:

fog-tests:
runs-on: [self-hosted, Linux, large]
container: mobilecoin/builder-install:v0.0.27
container: mobilecoin/builder-install:v0.0.29

strategy:
matrix:
Expand Down Expand Up @@ -275,7 +275,7 @@ jobs:

fog-ingest-tests:
runs-on: [self-hosted, Linux, large]
container: mobilecoin/builder-install:v0.0.27
container: mobilecoin/builder-install:v0.0.29

steps:
- name: Check out code
Expand All @@ -298,7 +298,7 @@ jobs:

fog-conformance-tests:
runs-on: [self-hosted, Linux, large]
container: mobilecoin/builder-install:v0.0.27
container: mobilecoin/builder-install:v0.0.29

steps:
- name: Check out code
Expand Down Expand Up @@ -338,7 +338,7 @@ jobs:

fog-local-network-tests:
runs-on: [self-hosted, Linux, large]
container: mobilecoin/builder-install:v0.0.27
container: mobilecoin/builder-install:v0.0.29

steps:
- name: Check out code
Expand Down Expand Up @@ -525,7 +525,7 @@ jobs:

minting-and-burning-tests:
runs-on: [self-hosted, Linux, large]
container: mobilecoin/builder-install:v0.0.27
container: mobilecoin/builder-install:v0.0.29

steps:
- name: Check out code
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dependent-repos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ env:
jobs:
android-bindings:
runs-on: [self-hosted, Linux, large]
container: mobilecoin/builder-install:v0.0.27
container: mobilecoin/builder-install:v0.0.29

permissions:
pull-requests: write
Expand All @@ -30,7 +30,7 @@ jobs:

full-service:
runs-on: [self-hosted, Linux, large]
container: mobilecoin/builder-install:v0.0.27
container: mobilecoin/builder-install:v0.0.29

permissions:
pull-requests: write
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mobilecoin-dev-cd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ jobs:
- generate-metadata
runs-on: [self-hosted, Linux, large-cd]
container:
image: mobilecoin/rust-sgx-base:v0.0.27
image: mobilecoin/rust-sgx-base:v0.0.29

env:
ENCLAVE_SIGNING_KEY_PATH: ${{ github.workspace }}/.tmp/enclave_signing.pem
Expand Down
4 changes: 2 additions & 2 deletions .internal-ci/docker/Dockerfile.dcap-runtime-base
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ RUN apt-get update \
COPY .internal-ci/docker/support/intel-sgx-archive-keyring.gpg /etc/apt/trusted.gpg.d/
RUN echo "deb [arch=amd64 signed-by=/etc/apt/trusted.gpg.d/intel-sgx-archive-keyring.gpg] https://download.01.org/intel-sgx/sgx_repo/ubuntu/ focal main" > /etc/apt/sources.list.d/intel-sgx.list

ARG SGX_SDK_VERSION=2.19.100.3-focal1
ARG SGX_SDK_VERSION=2.20.100.4-focal1
ENV SGX_SDK_VERSION=${SGX_SDK_VERSION}

# Explicitly call out *all* dependency versions. This is because the Intel
Expand All @@ -37,7 +37,7 @@ RUN apt-get update \
&& rm -r /var/lib/apt/lists

# Install DCAP libraries
ARG DCAP_VERSION=1.16.100.2-focal1
ARG DCAP_VERSION=1.17.100.4-focal1
ENV DCAP_VERSION=${DCAP_VERSION}

# Explicitly call out *all* dependency versions. This is because the Intel
Expand Down
4 changes: 2 additions & 2 deletions .internal-ci/docker/Dockerfile.runtime-base
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ ENV LD_LIBRARY_PATH="/opt/intel/sgx-aesm-service/aesm"
# libsgx-enclave-common libsgx-epid libsgx-launch libsgx-pce-logic libsgx-urts
# sgx-aesm-service
# Use `apt show -a sgx-aesm-service` to find version
ENV AESM_VERSION=2.18.100.3-focal1
ENV AESM_VERSION=2.20.100.4-focal1
# Use `apt show -a libsgx-pce-logic` to find the version thats compatible with aesm.
ENV PCE_LOGIC_VERSION=1.15.100.3-focal1
ENV PCE_LOGIC_VERSION=1.17.100.4-focal1


# Install packages
Expand Down
4 changes: 2 additions & 2 deletions .mobconf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[image]
url = mobilecoin/builder-install
tag = v0.0.27
tag = v0.0.29
[builder-install]
url = mobilecoin/builder-install
tag = v0.0.27
tag = v0.0.29
[signing-tools]
url = mobilecoin/signing-tools
tag = v0.0.1
2 changes: 1 addition & 1 deletion consensus/enclave/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const SGX_SIMULATION_LIBS: &[&str] = &["libsgx_urts_sim", "libsgx_epid_sim"];

// Changing this version is a breaking change, you must update the crate version
// if you do.
const SGX_VERSION: &str = "2.19.100.3";
const SGX_VERSION: &str = "2.20.100.4";

fn main() {
let env = Environment::default();
Expand Down
2 changes: 1 addition & 1 deletion consensus/enclave/measurement/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use std::{env::var, path::PathBuf};

// Changing this version is a breaking change, you must update the crate version
// if you do.
const SGX_VERSION: &str = "2.19.100.3";
const SGX_VERSION: &str = "2.20.100.4";

const CONSENSUS_ENCLAVE_PRODUCT_ID: u16 = 1;
const CONSENSUS_ENCLAVE_SECURITY_VERSION: u16 = 8;
Expand Down
2 changes: 1 addition & 1 deletion consensus/enclave/trusted/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const SGX_SIMULATION_LIBS: &[&str] = &["libsgx_urts_sim", "libsgx_epid_sim"];

// Changing this version is a breaking change, you must update the crate version
// if you do.
const SGX_VERSION: &str = "2.19.100.3";
const SGX_VERSION: &str = "2.20.100.4";

fn main() {
let env = Environment::default();
Expand Down
8 changes: 4 additions & 4 deletions consensus/service/BUILD.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,8 @@ Recommended SDK and package installation:
(
. /etc/os-release

wget "https://download.01.org/intel-sgx/sgx-linux/2.19/distro/ubuntu${VERSION_ID}-server/sgx_linux_x64_sdk_2.19.100.3.bin"
wget "https://download.01.org/intel-sgx/sgx-linux/2.19/distro/ubuntu${VERSION_ID}-server/sgx_linux_x64_driver_2.11.54c9c4c.bin"
wget "https://download.01.org/intel-sgx/sgx-linux/2.20/distro/ubuntu${VERSION_ID}-server/sgx_linux_x64_sdk_2.20.100.4.bin"
wget "https://download.01.org/intel-sgx/sgx-linux/2.20/distro/ubuntu${VERSION_ID}-server/sgx_linux_x64_driver_2.11.54c9c4c.bin"

echo "deb [arch=amd64 signed-by=/etc/apt/trusted.gpg.d/intel-sgx-archive-keyring.gpg] https://download.01.org/intel-sgx/sgx_repo/ubuntu/ ${UBUNTU_CODENAME} main" > /etc/apt/sources.list.d/intel-sgx.list
)
Expand All @@ -112,8 +112,8 @@ chmod +x ./sgx_linux_x64_driver_2.11.054c9c4c.bin
./sgx_linux_x64_driver_2.11.054c9c4c.bin

# Install the SDK to /opt/intel/sgxsdk
chmod +x ./sgx_linux_x64_sdk_2.19.100.3.bin
./sgx_linux_x64_sdk_2.19.100.3.bin --prefix=/opt/intel
chmod +x ./sgx_linux_x64_sdk_2.20.100.4.bin
./sgx_linux_x64_sdk_2.20.100.4.bin --prefix=/opt/intel

apt install libsgx-uae-service sgx-aesm-service

Expand Down
6 changes: 3 additions & 3 deletions docker/install_sgx.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ cd /tmp
(
. /etc/os-release

wget "https://download.01.org/intel-sgx/sgx-linux/2.19/distro/ubuntu${VERSION_ID}-server/sgx_linux_x64_sdk_2.19.100.3.bin"
wget "https://download.01.org/intel-sgx/sgx-linux/2.20/distro/ubuntu${VERSION_ID}-server/sgx_linux_x64_sdk_2.20.100.4.bin"

echo "deb [arch=amd64 signed-by=/etc/apt/trusted.gpg.d/intel-sgx-archive-keyring.gpg] https://download.01.org/intel-sgx/sgx_repo/ubuntu/ ${UBUNTU_CODENAME} main" > /etc/apt/sources.list.d/intel-sgx.list
)
Expand Down Expand Up @@ -59,8 +59,8 @@ apt-get install -yq --no-install-recommends \

# Install *after* pkg-config so that they get registered correctly.
# pkg-config gets pulled in transitively via build-essential
chmod +x ./sgx_linux_x64_sdk_2.19.100.3.bin
./sgx_linux_x64_sdk_2.19.100.3.bin --prefix=/opt/intel
chmod +x ./sgx_linux_x64_sdk_2.20.100.4.bin
./sgx_linux_x64_sdk_2.20.100.4.bin --prefix=/opt/intel

# Update .bashrc to source sgxsdk
echo 'source /opt/intel/sgxsdk/environment' >> /root/.bashrc
Expand Down
2 changes: 1 addition & 1 deletion fog/ingest/enclave/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const SGX_SIMULATION_LIBS: &[&str] = &["libsgx_urts_sim", "libsgx_epid_sim"];

// Changing this version is a breaking change, you must update the crate version
// if you do.
const SGX_VERSION: &str = "2.19.100.3";
const SGX_VERSION: &str = "2.20.100.4";

fn main() {
let env = Environment::default();
Expand Down
2 changes: 1 addition & 1 deletion fog/ingest/enclave/measurement/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use std::{env::var, path::PathBuf};

// Changing this version is a breaking change, you must update the crate version
// if you do.
const SGX_VERSION: &str = "2.19.100.3";
const SGX_VERSION: &str = "2.20.100.4";

const INGEST_ENCLAVE_PRODUCT_ID: u16 = 4;
const INGEST_ENCLAVE_SECURITY_VERSION: u16 = 7;
Expand Down
2 changes: 1 addition & 1 deletion fog/ingest/enclave/trusted/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const SGX_SIMULATION_LIBS: &[&str] = &["libsgx_urts_sim", "libsgx_epid_sim"];

// Changing this version is a breaking change, you must update the crate version
// if you do.
const SGX_VERSION: &str = "2.19.100.3";
const SGX_VERSION: &str = "2.20.100.4";

fn main() {
let env = Environment::default();
Expand Down
2 changes: 1 addition & 1 deletion fog/ledger/enclave/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const SGX_SIMULATION_LIBS: &[&str] = &["libsgx_urts_sim", "libsgx_epid_sim"];

// Changing this version is a breaking change, you must update the crate version
// if you do.
const SGX_VERSION: &str = "2.19.100.3";
const SGX_VERSION: &str = "2.20.100.4";

fn main() {
let env = Environment::default();
Expand Down
2 changes: 1 addition & 1 deletion fog/ledger/enclave/measurement/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use std::{env::var, path::PathBuf};

// Changing this version is a breaking change, you must update the crate version
// if you do.
const SGX_VERSION: &str = "2.19.100.3";
const SGX_VERSION: &str = "2.20.100.4";

const LEDGER_ENCLAVE_PRODUCT_ID: u16 = 2;
const LEDGER_ENCLAVE_SECURITY_VERSION: u16 = 7;
Expand Down
2 changes: 1 addition & 1 deletion fog/ledger/enclave/trusted/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const SGX_SIMULATION_LIBS: &[&str] = &["libsgx_urts_sim", "libsgx_epid_sim"];

// Changing this version is a breaking change, you must update the crate version
// if you do.
const SGX_VERSION: &str = "2.19.100.3";
const SGX_VERSION: &str = "2.20.100.4";

fn main() {
let env = Environment::default();
Expand Down
2 changes: 1 addition & 1 deletion fog/view/enclave/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const SGX_SIMULATION_LIBS: &[&str] = &["libsgx_urts_sim", "libsgx_epid_sim"];

// Changing this version is a breaking change, you must update the crate version
// if you do.
const SGX_VERSION: &str = "2.19.100.3";
const SGX_VERSION: &str = "2.20.100.4";

fn main() {
let env = Environment::default();
Expand Down
2 changes: 1 addition & 1 deletion fog/view/enclave/measurement/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use std::{env::var, path::PathBuf};

// Changing this version is a breaking change, you must update the crate version
// if you do.
const SGX_VERSION: &str = "2.19.100.3";
const SGX_VERSION: &str = "2.20.100.4";

const VIEW_ENCLAVE_PRODUCT_ID: u16 = 3;
const VIEW_ENCLAVE_SECURITY_VERSION: u16 = 7;
Expand Down
2 changes: 1 addition & 1 deletion fog/view/enclave/trusted/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const SGX_SIMULATION_LIBS: &[&str] = &["libsgx_urts_sim", "libsgx_epid_sim"];

// Changing this version is a breaking change, you must update the crate version
// if you do.
const SGX_VERSION: &str = "2.19.100.3";
const SGX_VERSION: &str = "2.20.100.4";

fn main() {
let env = Environment::default();
Expand Down
4 changes: 2 additions & 2 deletions ops/Dockerfile-consensus
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ RUN apt-get update -q -q && \

# Install SGX Ubuntu/Debian Repo
RUN source /etc/os-release && \
wget "https://download.01.org/intel-sgx/sgx-linux/2.19/distro/ubuntu${VERSION_ID}-server/sgx_linux_x64_driver_2.11.54c9c4c.bin" && \
wget "https://download.01.org/intel-sgx/sgx-linux/2.20/distro/ubuntu${VERSION_ID}-server/sgx_linux_x64_driver_2.11.54c9c4c.bin" && \

wget "https://download.01.org/intel-sgx/sgx-linux/2.19/distro/ubuntu${VERSION_ID}-server/sgx_linux_x64_sdk_2.19.100.3.bin" && \
wget "https://download.01.org/intel-sgx/sgx-linux/2.20/distro/ubuntu${VERSION_ID}-server/sgx_linux_x64_sdk_2.20.100.4.bin" && \
echo "deb [arch=amd64 signed-by=/usr/local/share/apt-keyrings/intel-sgx-archive-keyring.gpg] https://download.01.org/intel-sgx/sgx_repo/ubuntu/ ${UBUNTU_CODENAME} main" > /etc/apt/sources.list.d/intel-sgx.list

RUN mkdir -p /usr/local/share/apt-keyrings && \
Expand Down
Loading