Skip to content

Commit 93d1b5c

Browse files
authored
Update release/5.x to Open Enclave 0.19.13 (#7124)
1 parent 9d614d4 commit 93d1b5c

File tree

13 files changed

+29
-28
lines changed

13 files changed

+29
-28
lines changed

.azure-pipelines-release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ pr: none
88
resources:
99
containers:
1010
- container: virtual
11-
image: ghcr.io/microsoft/ccf/ci/default:build-21-05-2025
11+
image: ghcr.io/microsoft/ccf/ci/default:build-18-07-2025
1212
options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE -v /lib/modules:/lib/modules:ro
1313

1414
- container: snp
15-
image: ghcr.io/microsoft/ccf/ci/default:build-21-05-2025
15+
image: ghcr.io/microsoft/ccf/ci/default:build-18-07-2025
1616
options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE -v /lib/modules:/lib/modules:ro
1717

1818
- container: sgx
19-
image: ghcr.io/microsoft/ccf/ci/sgx:build-21-05-2025
19+
image: ghcr.io/microsoft/ccf/ci/sgx:build-18-07-2025
2020
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
2121

2222
variables:

.github/workflows/bencher.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
name: Continuous Benchmarking with Bencher
1212
runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
1313
container:
14-
image: ghcr.io/microsoft/ccf/ci/default:build-21-05-2025
14+
image: ghcr.io/microsoft/ccf/ci/default:build-18-07-2025
1515
steps:
1616
- uses: actions/checkout@v4
1717
with:

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
checks:
2121
name: "Format and License Checks"
2222
runs-on: ubuntu-latest
23-
container: ghcr.io/microsoft/ccf/ci/default:build-21-05-2025
23+
container: ghcr.io/microsoft/ccf/ci/default:build-18-07-2025
2424

2525
steps:
2626
- run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
@@ -48,7 +48,7 @@ jobs:
4848
options: --user root --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE --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
4949
runs-on: ${{ matrix.platform.nodes }}
5050
container:
51-
image: ghcr.io/microsoft/ccf/ci/${{ matrix.platform.image }}:build-21-05-2025
51+
image: ghcr.io/microsoft/ccf/ci/${{ matrix.platform.image }}:build-18-07-2025
5252
options: ${{ matrix.platform.options }}
5353
steps:
5454
- uses: actions/checkout@v4

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
# Insufficient space to run on public runner, so use custom pool
2626
runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
2727
container:
28-
image: ghcr.io/microsoft/ccf/ci/default:build-21-05-2025
28+
image: ghcr.io/microsoft/ccf/ci/default:build-18-07-2025
2929
options: --user root
3030

3131
permissions:

.github/workflows/long-test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
name: "Scan build"
1111
runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
1212
container:
13-
image: ghcr.io/microsoft/ccf/ci/default:build-21-05-2025
13+
image: ghcr.io/microsoft/ccf/ci/default:build-18-07-2025
1414

1515
steps:
1616
- uses: actions/checkout@v4
@@ -27,7 +27,7 @@ jobs:
2727
name: ASAN
2828
runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
2929
container:
30-
image: ghcr.io/microsoft/ccf/ci/default:build-21-05-2025
30+
image: ghcr.io/microsoft/ccf/ci/default:build-18-07-2025
3131

3232
steps:
3333
- uses: actions/checkout@v4
@@ -69,7 +69,7 @@ jobs:
6969
name: TSAN
7070
runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
7171
container:
72-
image: ghcr.io/microsoft/ccf/ci/default:build-21-05-2025
72+
image: ghcr.io/microsoft/ccf/ci/default:build-18-07-2025
7373

7474
steps:
7575
- uses: actions/checkout@v4

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ jobs:
8080
cmake_options: -DLVI_MITIGATIONS=ON
8181
runs-on: ${{ matrix.platform.nodes }}
8282
container:
83-
image: ghcr.io/microsoft/ccf/ci/${{ matrix.platform.image }}:build-21-05-2025
83+
image: ghcr.io/microsoft/ccf/ci/${{ matrix.platform.image }}:build-18-07-2025
8484
options: "--user root --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE -v /lib/modules:/lib/modules:ro ${{ matrix.platform.container_options }}"
8585
steps:
8686
- uses: actions/checkout@v4

.github/workflows/tlaplus.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
name: Model Checking - Consistency
2424
runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
2525
container:
26-
image: ghcr.io/microsoft/ccf/ci/default:build-21-05-2025
26+
image: ghcr.io/microsoft/ccf/ci/default:build-18-07-2025
2727

2828
steps:
2929
- uses: actions/checkout@v4
@@ -120,7 +120,7 @@ jobs:
120120
name: Model Checking - Consensus
121121
runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
122122
container:
123-
image: ghcr.io/microsoft/ccf/ci/default:build-21-05-2025
123+
image: ghcr.io/microsoft/ccf/ci/default:build-18-07-2025
124124

125125
steps:
126126
- uses: actions/checkout@v4
@@ -154,7 +154,7 @@ jobs:
154154
name: Model Checking With Reconfig - Consensus
155155
runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
156156
container:
157-
image: ghcr.io/microsoft/ccf/ci/default:build-21-05-2025
157+
image: ghcr.io/microsoft/ccf/ci/default:build-18-07-2025
158158

159159
steps:
160160
- uses: actions/checkout@v4
@@ -209,7 +209,7 @@ jobs:
209209
name: Trace Validation - Consensus
210210
runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
211211
container:
212-
image: ghcr.io/microsoft/ccf/ci/default:build-21-05-2025
212+
image: ghcr.io/microsoft/ccf/ci/default:build-18-07-2025
213213

214214
steps:
215215
- uses: actions/checkout@v4

CHANGELOG.md

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
66
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
77

8+
## [5.0.19]
9+
10+
[5.0.19]: https://github.com/microsoft/CCF/releases/tag/5.0.19
11+
12+
### Dependencies
13+
14+
- Updated Open Enclave from 0.19.11 to 0.19.13 (#7124).
15+
816
## [5.0.18]
917

1018
[5.0.18]: https://github.com/microsoft/CCF/releases/tag/5.0.18
@@ -1248,13 +1256,11 @@ Key-Value Store
12481256
#### Certificate(s) Validity Period
12491257

12501258
- Nodes certificates validity period is no longer hardcoded and must instead be set by operators and renewed by members (#2924):
1251-
12521259
- The new `node_certificate.initial_validity_days` (defaults to 1 day) configuration entry lets operators set the initial validity period for the node certificate (valid from the current system time).
12531260
- The new `command.start.service_configuration.maximum_node_certificate_validity_days` (defaults to 365 days) configuration entry sets the maximum validity period allowed for node certificates.
12541261
- The new `set_node_certificate_validity` proposal action allows members to renew a node certificate (or `set_all_nodes_certificate_validity` equivalent action to renew _all_ trusted nodes certificates).
12551262

12561263
- Service certificate validity period is no longer hardcoded and must instead be set by operators and renewed by members (#3363):
1257-
12581264
- The new `service_certificate_initial_validity_days` (defaults to 1 day) configuration entry lets operators set the initial validity period for the service certificate (valid from the current system time).
12591265
- The new `maximum_service_certificate_validity_days` (defaults to 365 days) configuration entry sets the maximum validity period allowed for service certificate.
12601266
- The new `set_service_certificate_validity` proposal action allows members to renew the service certificate.
@@ -1535,13 +1541,11 @@ Key-Value Store
15351541
#### Certificate(s) Validity Period
15361542

15371543
- Nodes certificates validity period is no longer hardcoded and must instead be set by operators and renewed by members (#2924):
1538-
15391544
- The new `node_certificate.initial_validity_days` (defaults to 1 day) configuration entry lets operators set the initial validity period for the node certificate (valid from the current system time).
15401545
- The new `command.start.service_configuration.maximum_node_certificate_validity_days` (defaults to 365 days) configuration entry sets the maximum validity period allowed for node certificates.
15411546
- The new `set_node_certificate_validity` proposal action allows members to renew a node certificate (or `set_all_nodes_certificate_validity` equivalent action to renew _all_ trusted nodes certificates).
15421547

15431548
- Service certificate validity period is no longer hardcoded and must instead be set by operators and renewed by members (#3363):
1544-
15451549
- The new `service_certificate_initial_validity_days` (defaults to 1 day) configuration entry lets operators set the initial validity period for the service certificate (valid from the current system time).
15461550
- The new `maximum_service_certificate_validity_days` (defaults to 365 days) configuration entry sets the maximum validity period allowed for service certificate.
15471551
- The new `set_service_certificate_validity` proposal action allows members to renew the service certificate.
@@ -2284,17 +2288,14 @@ The 1.0 release will require minimal changes from this release.
22842288
### Added
22852289

22862290
- Experimental
2287-
22882291
- New CCF nodes can now join from a [snapshot](https://microsoft.github.io/CCF/ccf-0.13.0/operators/start_network.html#resuming-from-existing-snapshot) (#1500, #1532)
22892292
- New KV maps can now be created dynamically in a transaction (#1507, #1528)
22902293

22912294
- CLI
2292-
22932295
- Subject Name and Subject Alternative Names for the node certificates can now be passed to cchost using the --sn and --san CLI switches (#1537)
22942296
- Signature and ledger splitting [flags](https://microsoft.github.io/CCF/ccf-0.13.0/operators/start_network.html#signature-interval) have been renamed more accurately (#1534)
22952297

22962298
- Governance
2297-
22982299
- `user_data` can be set at user creation, as well as later (#1488)
22992300

23002301
- Javascript

cmake/cpack_settings.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ message(STATUS "Debian package version: ${CPACK_DEBIAN_PACKAGE_VERSION}")
2424
set(CCF_DEB_BASE_DEPENDENCIES "libuv1 (>= 1.34.2);openssl (>=1.1.1f)")
2525
set(CCF_DEB_DEPENDENCIES ${CCF_DEB_BASE_DEPENDENCIES})
2626

27-
set(OE_VERSION "0.19.11")
27+
set(OE_VERSION "0.19.13")
2828
if(COMPILE_TARGET STREQUAL "sgx")
2929
list(APPEND CCF_DEB_DEPENDENCIES
3030
"libc++1-11;libc++abi1-11;open-enclave (>=${OE_VERSION})"

cmake/open_enclave.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ if(REQUIRE_OPENENCLAVE)
1313
endif()
1414

1515
# Find OpenEnclave package
16-
find_package(OpenEnclave 0.19.11 CONFIG REQUIRED)
16+
find_package(OpenEnclave 0.19.13 CONFIG REQUIRED)
1717

1818
option(USE_OPENSSL_3 "Use OpenSSL 3.x for Open Enclave builds" ON)
1919
if(USE_OPENSSL_3)

0 commit comments

Comments
 (0)