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

Bump to SGX SDK 2.12 and mention also Ubuntu 20.04 #509

Merged
merged 3 commits into from
Dec 28, 2020
Merged

Bump to SGX SDK 2.12 and mention also Ubuntu 20.04 #509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c95c3d4
Bump to SGX SDK 2.12 and mention also Ubuntu 20.04
g2flyer Dec 22, 2020
1d45f10
Make clang-format work in both ubuntus
g2flyer Dec 25, 2020
ec634a5
Merge branch 'master' into msteiner.sgx-2.12+ubuntu-20.04
bvavala Dec 28, 2020
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
1 change: 1 addition & 0 deletions .clang-format
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,4 @@ NamespaceIndentation: Inner
DerivePointerAlignment: false
AccessModifierOffset: -4
BinPackParameters: false
IncludeBlocks: Preserve
7 changes: 6 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,11 @@ First make sure your host has
* GNU make

A few notes:
* While we mostly test on 18.04, FPC should work also with Ubuntu 20.04.
To build also docker images based on Ubuntu 20.04, add the following to `${FPC_PATH}/config.override.mk`
```bash
DOCKER_BUILD_OPTS=--build-arg UBUNTU_VERSION=20.04 --build-arg UBUNTU_NAME=focal
```
* if you run behind a proxy, you will have to configure the proxy,
e.g., for docker (`~/.docker/config.json`). See
[Working from behind a proxy](#working-from-behind-a-proxy) below for more information.
Expand Down Expand Up @@ -272,7 +277,7 @@ Make sure that you have the following required dependencies installed:
- Protocol Buffers 3.0.x needed for the Intel SGX SDK
- Protocol Buffers 3.11.x or higher and [Nanopb](http://github.com/nanopb/nanopb) 0.4.3

* SGX PSW & SDK v2.10 for [Linux](https://01.org/intel-software-guard-extensions/downloads)
* SGX PSW & SDK v2.12 for [Linux](https://01.org/intel-software-guard-extensions/downloads)
(alternatively, you could also install it from the [source](https://github.com/intel/linux-sgx)

* Credentials for Intel Attestation Service, read [here](#intel-attestation-service-ias) (for hardware-mode SGX)
Expand Down
2 changes: 1 addition & 1 deletion docs/design/fabric-v2+/interfaces.ecc-tlcc-channel.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ See message definition in `protos/fpc/tl_session.proto`

The session setup is built around DH key-exchange provided by the SGX
SDK.
See [Developer Reference Guide v2.10](https://download.01.org/intel-sgx/latest/linux-latest/docs/Intel_SGX_Developer_Reference_Linux_2.10_Open_Source.pdf)
See [Developer Reference Guide v2.12](https://download.01.org/intel-sgx/latest/linux-latest/docs/Intel_SGX_Developer_Reference_Linux_2.12_Open_Source.pdf)
for more information; in particular, pages 97-102 for an overview and the
corresponding message flows, and page 121 and 305ff for the function definitions.

Expand Down
2 changes: 1 addition & 1 deletion utils/docker/base-rt/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ ARG UBUNTU_VERSION
ARG UBUNTU_NAME

# config/build params (part 2)
ARG SGX=2.10
ARG SGX=2.12
ARG PROTO_VERSION=3.11.4
ARG APT_ADD_PKGS=

Expand Down