microsoft
/
CCF
зеркало из https://github.com/microsoft/CCF.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

[release/2.x] Cherry pick: Upgrade Open Enclave from 0.18.2 to 0.18.4 (#4510) (#4531)

This commit is contained in:
Amaury Chamayou 2022-11-11 16:16:53 +00:00 коммит произвёл GitHub
Родитель 262e4bbd2c
Коммит 7f5fd2a028
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
11 изменённых файлов: 25 добавлений и 22 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
.azure-pipelines-gh-pages.yml
Просмотреть файл

@ -7,7 +7,7 @@ trigger:
jobs:
- job: build_and_publish_docs
container: ccfmsrc.azurecr.io/ccf/ci/sgx:oe-0.18.2-0
container: ccfmsrc.azurecr.io/ccf/ci:oe-0.18.4-dcap-ql-dev-sgx
pool:
vmImage: ubuntu-20.04

2
.azure-pipelines-quictls.yml
Просмотреть файл

@ -17,7 +17,7 @@ parameters:
jobs:
- job: build_quictls
container: ccfmsrc.azurecr.io/ccf/ci/sgx:oe-0.18.2-0
container: ccfmsrc.azurecr.io/ccf/ci:oe-0.18.4-dcap-ql-dev-sgx
pool: 1es-dv4-focal
strategy:

8
.azure-pipelines.yml
Просмотреть файл

@ -27,12 +27,12 @@ schedules:
resources:
containers:
- container: nosgx
image: ccfmsrc.azurecr.io/ccf/ci/sgx:oe-0.18.2-0
options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE -v /dev/shm:/tmp/ccache -v /lib/modules:/lib/modules:ro
image: ccfmsrc.azurecr.io/ccf/ci:oe-0.18.4-dcap-ql-dev-sgx
options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE -v /lib/modules:/lib/modules:ro
- container: sgx
image: ccfmsrc.azurecr.io/ccf/ci/sgx:oe-0.18.2-0
options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --device /dev/sgx_enclave:/dev/sgx_enclave --device /dev/sgx_provision:/dev/sgx_provision -v /dev/sgx:/dev/sgx -v /dev/shm:/tmp/ccache -v /lib/modules:/lib/modules:ro
image: ccfmsrc.azurecr.io/ccf/ci:oe-0.18.4-dcap-ql-dev-sgx
options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --device /dev/sgx_enclave:/dev/sgx_enclave --device /dev/sgx_provision:/dev/sgx_provision -v /dev/sgx:/dev/sgx -v /lib/modules:/lib/modules:ro
variables:
${{ if startsWith(variables['Build.SourceBranch'], 'refs/tags/ccf-') }}:

8
.daily.yml
Просмотреть файл

@ -23,12 +23,12 @@ schedules:
resources:
containers:
- container: nosgx
image: ccfmsrc.azurecr.io/ccf/ci/sgx:oe-0.18.2-0
options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE -v /dev/shm:/tmp/ccache
image: ccfmsrc.azurecr.io/ccf/ci:oe-0.18.4-dcap-ql-dev-sgx
options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE
- container: sgx
image: ccfmsrc.azurecr.io/ccf/ci/sgx:oe-0.18.2-0
options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --device /dev/sgx_enclave:/dev/sgx_enclave --device /dev/sgx_provision:/dev/sgx_provision -v /dev/sgx:/dev/sgx -v /dev/shm:/tmp/ccache
image: ccfmsrc.azurecr.io/ccf/ci:oe-0.18.4-dcap-ql-dev-sgx
options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --device /dev/sgx_enclave:/dev/sgx_enclave --device /dev/sgx_provision:/dev/sgx_provision -v /dev/sgx:/dev/sgx
jobs:
- template: .azure-pipelines-templates/daily-matrix.yml

5
.devcontainer/devcontainer.json
Просмотреть файл

@ -1,7 +1,6 @@
{
"name": "Sample Development Environment for CCF",
"context": "..",
"image": "ccfmsrc.azurecr.io/ccf/ci/sgx:oe-0.18.2-0",
"name": "CCF Development Environment",
"image": "ccfmsrc.azurecr.io/ccf/ci:oe-0.18.4-dcap-ql-dev-sgx",
"runArgs": [],
"extensions": ["ms-vscode.cpptools", "ms-python.python"]
}

2
.github/workflows/ci-checks.yml поставляемый
Просмотреть файл

@ -9,7 +9,7 @@ on:
jobs:
checks:
runs-on: ubuntu-latest
container: ccfmsrc.azurecr.io/ccf/ci/sgx:oe-0.18.2-0
container: ccfmsrc.azurecr.io/ccf/ci:oe-0.18.4-dcap-ql-dev-sgx
steps:
- run: git config --global --add safe.directory "$GITHUB_WORKSPACE"

2
.multi-thread.yml
Просмотреть файл

@ -16,7 +16,7 @@ pr:
resources:
containers:
- container: sgx
image: ccfmsrc.azurecr.io/ccf/ci/sgx:oe-0.18.2-0
image: ccfmsrc.azurecr.io/ccf/ci:oe-0.18.4-dcap-ql-dev-sgx
options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --device /dev/sgx_enclave:/dev/sgx_enclave --device /dev/sgx_provision:/dev/sgx_provision -v /dev/sgx:/dev/sgx -v /dev/shm:/tmp/ccache
jobs:

4
.stress.yml
Просмотреть файл

@ -21,8 +21,8 @@ schedules:
resources:
containers:
- container: sgx
image: ccfmsrc.azurecr.io/ccf/ci/sgx:oe-0.18.2-0
options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --device /dev/sgx_enclave:/dev/sgx_enclave --device /dev/sgx_provision:/dev/sgx_provision -v /dev/sgx:/dev/sgx -v /dev/shm:/tmp/ccache
image: ccfmsrc.azurecr.io/ccf/ci:oe-0.18.4-dcap-ql-dev-sgx
options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --device /dev/sgx_enclave:/dev/sgx_enclave --device /dev/sgx_provision:/dev/sgx_provision -v /dev/sgx:/dev/sgx
jobs:
- template: .azure-pipelines-templates/stress-matrix.yml

10
CHANGELOG.md
Просмотреть файл

@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
## [2.0.9]
### Dependencies
- Upgraded OpenEnclave to 0.18.4.
## [2.0.8]
### Fixed
@ -1583,6 +1589,7 @@ Some discrepancies with the TR remain, and are being tracked under https://githu
Initial pre-release
[2.0.9]: https://github.com/microsoft/CCF/releases/tag/ccf-2.0.9
[2.0.8]: https://github.com/microsoft/CCF/releases/tag/ccf-2.0.8
[2.0.7]: https://github.com/microsoft/CCF/releases/tag/ccf-2.0.7
[2.0.6]: https://github.com/microsoft/CCF/releases/tag/ccf-2.0.6
@ -1674,6 +1681,3 @@ Initial pre-release
[0.5]: https://github.com/microsoft/CCF/releases/tag/v0.5
[0.4]: https://github.com/microsoft/CCF/releases/tag/v0.4
[0.3]: https://github.com/microsoft/CCF/releases/tag/v0.3
[2.0.0-rc8]: https://github.com/microsoft/CCF/releases/tag/ccf-2.0.0-rc8
[unreleased]: https://github.com/microsoft/CCF/releases/tag/ccf-Unreleased
[3.0.0-dev4]: https://github.com/microsoft/CCF/releases/tag/ccf-3.0.0-dev4

2
cmake/ccf_app.cmake
Просмотреть файл

@ -30,7 +30,7 @@ if((NOT ${IS_VALID_TARGET}))
endif()
# Find OpenEnclave package
find_package(OpenEnclave 0.18.2 CONFIG REQUIRED)
find_package(OpenEnclave 0.18.4 CONFIG REQUIRED)
# As well as pulling in openenclave:: targets, this sets variables which can be
# used for our edge cases (eg - for virtual libraries). These do not follow the
# standard naming patterns, for example use OE_INCLUDEDIR rather than

2
cmake/cpack_settings.cmake
Просмотреть файл

@ -19,7 +19,7 @@ endif()
# CPack variables for Debian packages
set(CPACK_DEBIAN_PACKAGE_DEPENDS
"open-enclave (>=0.18.2), libuv1 (>= 1.34.2), libc++1-10, libc++abi1-10, openssl (>=1.1.1)"
"open-enclave (>=0.18.4), libuv1 (>= 1.34.2), libc++1-10, libc++abi1-10, openssl (>=1.1.1)"
)
set(CPACK_DEBIAN_FILE_NAME DEB-DEFAULT)