Merge branch 'main' into abs-tla

.github/ISSUE_TEMPLATE/bug_report.md

@@ -16,7 +16,7 @@ Steps to reproduce the behavior.
 A clear and concise description of what you expected to happen.
 
 **Environment information**
-Version of the code being used, versions of dependencies, relevant environment info where applicable (OS, SGX driver...).
+Version of the code being used, versions of dependencies, relevant environment info where applicable (OS, Platform component details...).
 
 **Additional context**
 Add any other context about the problem here.

.github/workflows/README.md

@@ -30,7 +30,7 @@ File: `ci-containers-ghcr.yml`
 
 # CI
 
-Main continuous integration job. Builds CCF for all target platforms, runs unit, end to end and partition tests for SGX and Virtual. Run on every commit, including PRs from forks, gates merging. Also runs once a week, regardless of commits.
+Main continuous integration job. Builds CCF for all target platforms, runs unit, end to end and partition tests Virtual. Run on every commit, including PRs from forks, gates merging. Also runs once a week, regardless of commits.
 
 File: `ci.yml`
 3rd party dependencies: None

.github/workflows/ci.yml

@@ -42,10 +42,6 @@ jobs:
             image: default
             nodes: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
             options: --user root --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE -v /lib/modules:/lib/modules:ro
-          - name: sgx
-            image: sgx
-            nodes: [self-hosted, 1ES.Pool=gha-sgx-ccf-sub]
-            options: --user root --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
     runs-on: ${{ matrix.platform.nodes }}
     container:
       image: ghcr.io/microsoft/ccf/ci/${{ matrix.platform.image }}:build-25-07-2024
@@ -65,15 +61,6 @@ jobs:
           ninja
         shell: bash
 
-      - name: "Platform SGX"
-        run: |
-          sudo groupadd -fg $(/usr/bin/stat -Lc '%g' /dev/sgx/provision) sgx_prv
-          sudo usermod -a -G sgx_prv $(whoami)
-          samples/scripts/sgxinfo.sh
-          cat /proc/cpuinfo | grep flags | uniq
-        shell: bash
-        if: "${{ matrix.platform.name == 'sgx' }}"
-
       - name: "Platform SNP"
         run: |
           samples/scripts/snpinfo.sh

.github/workflows/tlaplus.yml

@@ -256,7 +256,7 @@ jobs:
 
       - name: Upload artifacts.
         uses: actions/upload-artifact@v4
-        if: ${{ failure() }}
+        if: always()
         with:
           name: tlc
           path: |

.snpcc_canary

@@ -3,4 +3,4 @@
    O     \     o      |    /
 /-xXx--//-----x=x--/-xXx--/---x---->>>--/
 ...
-/\/\(-_-)
+/\/\d(-_-)b

CHANGELOG.md

@@ -5,6 +5,26 @@ 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).
 
+## [6.0.0-dev0]
+
+[6.0.0-dev0]: https://github.com/microsoft/CCF/releases/tag/6.0.0-dev0
+
+### Changed
+
+- The `set_jwt_issuer` governance action has been updated, and no longer accepts `key_filter` or `key_policy` arguments (#6450).
+
+### Removed
+
+- SGX Platform support.
+
+## [5.0.4]
+
+[5.0.4]: https://github.com/microsoft/CCF/releases/tag/ccf-5.0.4
+
+### Bug fix
+
+- JWT authentication correctly parses certificates that contain other certificates (#6440)
+
 ## [5.0.3]
 
 [5.0.3]: https://github.com/microsoft/CCF/releases/tag/ccf-5.0.3