upgraded to ccf 3.0.13

.devcontainer/Dockerfile

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/ccf/app/dev:3.0.9-virtual
+FROM mcr.microsoft.com/ccf/app/dev:3.0.13-virtual
 
 # Dependency of the virtual build of attested-fetch.
 RUN apt-get update && apt-get install -y libcurl4-openssl-dev

.github/workflows/build-test-virtual.yml

@@ -7,7 +7,7 @@ jobs:
       run:
         shell: bash
     container:
-      image: mcr.microsoft.com/ccf/app/dev:3.0.9-virtual
+      image: mcr.microsoft.com/ccf/app/dev:3.0.13-virtual
       env:
         # Helps to distinguish between CI and local builds.
         SCITT_CI: 1
@@ -27,7 +27,7 @@ jobs:
       # Work-around for https://github.com/actions/runner/issues/2033
       - name: Work around git safe.directory in container
         run: chown -R $(id -u):$(id -g) $PWD
-      - run: apt-get update && apt-get install -y libcurl4-openssl-dev faketime clang-tidy-10
+      - run: apt-get update && apt-get install -y libcurl4-openssl-dev faketime clang-tidy-11
       - run: ./scripts/ci-checks.sh
       - run: ./build.sh
       - run: ./run_unit_tests.sh

.github/workflows/codeql.yml

@@ -17,7 +17,7 @@ jobs:
     name: Analyze
 
     runs-on: ubuntu-latest
-    container: mcr.microsoft.com/ccf/app/dev:3.0.9-virtual
+    container: mcr.microsoft.com/ccf/app/dev:3.0.13-virtual
 
     permissions:
       actions: read

.pipelines/azure-pipelines.yml

@@ -9,7 +9,7 @@ trigger:
 parameters:
   - name: CCF_VERSION
     type: string
-    default: 3.0.9
+    default: 3.0.13
 
 resources:
   containers:

DEVELOPMENT.md

@@ -24,10 +24,10 @@ Follow the steps below to setup your development environment, replacing `<sgx|vi
 
 2. Install dependencies:
     ```sh
-    wget https://github.com/microsoft/CCF/archive/refs/tags/ccf-3.0.9.tar.gz
-    tar xvzf ccf-3.0.9.tar.gz
-    cd CCF-ccf-3.0.9/getting_started/setup_vm/
-    ./run.sh app-dev.yml -e ccf_ver=3.0.9 -e platform=<sgx|virtual>
+    wget https://github.com/microsoft/CCF/archive/refs/tags/ccf-3.0.13.tar.gz
+    tar xvzf ccf-3.0.13.tar.gz
+    cd CCF-ccf-3.0.13/getting_started/setup_vm/
+    ./run.sh app-dev.yml -e ccf_ver=3.0.13 -e platform=<sgx|virtual>
     ```
 
 ## Building

app/CMakeLists.txt

@@ -30,9 +30,9 @@ if (CCF_UNSAFE)
     message(FATAL_ERROR "The unsafe CCF variant is only available on SGX builds.")
   endif()
 
-  find_package(ccf_sgx_unsafe 3.0.9 REQUIRED)
+  find_package(ccf_sgx_unsafe 3.0.13 REQUIRED)
 else()
-  find_package(ccf_${COMPILE_TARGET} 3.0.9 REQUIRED)
+  find_package(ccf_${COMPILE_TARGET} 3.0.13 REQUIRED)
 endif()
 
 if (ENABLE_PREFIX_TREE)
@@ -66,7 +66,7 @@ endif ()
 target_include_directories(${SCITT_TARGET} PRIVATE src ${CMAKE_CURRENT_BINARY_DIR}/src)
 
 if (ENABLE_CLANG_TIDY)
-  find_program (CLANG_TIDY_EXE NAMES "clang-tidy-10" "clang-tidy" REQUIRED)
+  find_program (CLANG_TIDY_EXE NAMES "clang-tidy-11" "clang-tidy" REQUIRED)
   set_target_properties(${SCITT_TARGET} PROPERTIES
     C_CLANG_TIDY "${CLANG_TIDY_EXE}"
     CXX_CLANG_TIDY "${CLANG_TIDY_EXE}")

build.sh

@@ -9,8 +9,8 @@ PLATFORM=${PLATFORM:-sgx}
 CCF_UNSAFE=${CCF_UNSAFE:-OFF}
 ENABLE_PREFIX_TREE=${ENABLE_PREFIX_TREE:-OFF}
 BUILD_TESTS=${BUILD_TESTS:-ON}
-CC=${CC:-clang-10}
-CXX=${CXX:-clang++-10}
+CC=${CC:-clang-11}
+CXX=${CXX:-clang++-11}
 ENABLE_CLANG_TIDY=${ENABLE_CLANG_TIDY:-OFF}
 NINJA_FLAGS=${NINJA_FLAGS:-}
 

docker/enclave.Dockerfile

@@ -1,4 +1,4 @@
-ARG CCF_VERSION=3.0.9
+ARG CCF_VERSION=3.0.13
 FROM mcr.microsoft.com/ccf/app/dev:${CCF_VERSION}-sgx as builder
 ARG CCF_VERSION
 ARG SCITT_VERSION_OVERRIDE
@@ -7,7 +7,7 @@ ARG SCITT_VERSION_OVERRIDE
 COPY ./3rdparty/attested-fetch /tmp/attested-fetch/
 RUN mkdir /tmp/attested-fetch-build && \
     cd /tmp/attested-fetch-build && \
-    CC="/opt/oe_lvi/clang-10" CXX="/opt/oe_lvi/clang++-10" cmake -GNinja \
+    CC="clang-11" CXX="clang++-11" cmake -GNinja \
     -DCOMPILE_TARGET="sgx" \
     -DCMAKE_BUILD_TYPE=RelWithDebInfo \
     -DCMAKE_INSTALL_PREFIX=/usr/src/app/attested-fetch \
@@ -22,7 +22,7 @@ RUN /opt/openenclave/bin/oesign dump -e libafetch.enclave.so.signed | sed -n "s/
 COPY ./app /tmp/app/
 RUN mkdir /tmp/app-build && \
     cd /tmp/app-build && \
-    CC="/opt/oe_lvi/clang-10" CXX="/opt/oe_lvi/clang++-10" cmake -GNinja \
+    CC="clang-11" CXX="clang++-11" cmake -GNinja \
     -DCMAKE_BUILD_TYPE=RelWithDebInfo \
     -DCMAKE_INSTALL_PREFIX=/usr/src/app \
     -DCOMPILE_TARGET="sgx" \

docker/virtual.Dockerfile

@@ -1,4 +1,4 @@
-ARG CCF_VERSION=3.0.9
+ARG CCF_VERSION=3.0.13
 FROM mcr.microsoft.com/ccf/app/dev:${CCF_VERSION}-virtual as builder
 ARG CCF_VERSION
 ARG SCITT_VERSION_OVERRIDE
@@ -8,7 +8,7 @@ RUN apt-get update && apt-get install -y libcurl4-openssl-dev
 COPY ./3rdparty/attested-fetch /tmp/attested-fetch/
 RUN mkdir /tmp/attested-fetch-build && \
     cd /tmp/attested-fetch-build && \
-    CC=clang-10 CXX=clang++-10 cmake -GNinja \
+    CC=clang-15 CXX=clang++-15 cmake -GNinja \
     -DCOMPILE_TARGET="virtual" \
     -DCMAKE_BUILD_TYPE=RelWithDebInfo \
     -DCMAKE_INSTALL_PREFIX=/usr/src/app/attested-fetch \
@@ -19,7 +19,7 @@ RUN mkdir /tmp/attested-fetch-build && \
 COPY ./app /tmp/app/
 RUN mkdir /tmp/app-build && \
     cd /tmp/app-build && \
-    CC=clang-10 CXX=clang++-10 cmake -GNinja \
+    CC=clang-15 CXX=clang++-15 cmake -GNinja \
     -DCMAKE_BUILD_TYPE=RelWithDebInfo \
     -DCMAKE_INSTALL_PREFIX=/usr/src/app \
     -DCOMPILE_TARGET="virtual" \

pyscitt/setup.py

@@ -13,7 +13,7 @@
     },
     python_requires=">=3.8",
     install_requires=[
-        "ccf==3.0.9",
+        "ccf==3.0.13",
         "cryptography==39.*",  # needs to match ccf
         "httpx",
         "cbor2",

scripts/check-format.sh

@@ -32,9 +32,9 @@ file_name_regex="^[[:lower:]0-9_]+$"
 unformatted_files=""
 badly_named_files=""
 for file in $(git ls-files "$@" | grep -e '\.h$' -e '\.hpp$' -e '\.cpp$' -e '\.c$' -e '\.proto$'); do
-  if ! clang-format-10 -n -Werror -style=file "$file"; then
+  if ! clang-format-11 -n -Werror -style=file "$file"; then
     if $fix ; then
-      clang-format-10 -style=file -i "$file"
+      clang-format-11 -style=file -i "$file"
     fi
     if [ "$unformatted_files" != "" ]; then
       unformatted_files+=$'\n'