WIP

Author: maxtropets

.github/workflows/ci.yml

@@ -218,6 +218,14 @@ jobs:
           python3 tests/infra/platform_detection.py snp milan
         shell: bash
 
+      # Move to container
+      - name: "Install dependencies"
+        shell: bash
+        run: |
+          set -ex
+          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal --component rustfmt
+          export PATH="$HOME/.cargo/bin:$PATH"
+
       - name: "Build Debug"
         run: |
           set -ex
@@ -299,6 +307,14 @@ jobs:
           python3 tests/infra/platform_detection.py snp genoa
         shell: bash
 
+      # Move to container
+      - name: "Install dependencies"
+        shell: bash
+        run: |
+          set -ex
+          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal --component rustfmt
+          export PATH="$HOME/.cargo/bin:$PATH"
+
       - name: "Build Debug"
         run: |
           set -ex

CMakeLists.txt

@@ -173,11 +173,10 @@ set(HTTP_PARSER_SOURCES
     ${CCF_3RD_PARTY_EXPORTED_DIR}/llhttp/llhttp.c
 )
 
+include(${CCF_DIR}/cmake/cose_openssl.cmake)
 include(${CCF_DIR}/cmake/crypto.cmake)
 include(${CCF_DIR}/cmake/quickjs.cmake)
-include(${CCF_DIR}/cmake/qcbor.cmake)
 include(${CCF_DIR}/cmake/evercbor.cmake)
-include(${CCF_DIR}/cmake/t_cose.cmake)
 
 # Launcher library
 list(APPEND CCF_LAUNCHER_SOURCES ${CCF_DIR}/src/host/run.cpp
@@ -271,8 +270,6 @@ add_ccf_static_library(
   LINK_LIBS http_parser ccfcrypto ccf_kv
 )
 
-target_link_libraries(ccf_endpoints PRIVATE t_cose) # For cose_auth only
-
 # CCF task system library
 add_ccf_static_library(
   ccf_tasks
@@ -633,7 +630,7 @@ if(BUILD_TESTS)
       crypto_test ${CMAKE_CURRENT_SOURCE_DIR}/src/crypto/test/crypto.cpp
     )
     target_include_directories(crypto_test PRIVATE ${CCFCRYPTO_INC})
-    target_link_libraries(crypto_test PRIVATE ccfcrypto t_cose)
+    target_link_libraries(crypto_test PRIVATE ccfcrypto)
 
     add_unit_test(
       cbor_test ${CMAKE_CURRENT_SOURCE_DIR}/src/crypto/test/cbor.cpp
@@ -738,9 +735,7 @@ if(BUILD_TESTS)
     add_unit_test(
       cose_test ${CMAKE_CURRENT_SOURCE_DIR}/src/crypto/test/cose.cpp
     )
-    target_link_libraries(
-      cose_test PRIVATE ${CMAKE_THREAD_LIBS_INIT} ccfcrypto t_cose
-    )
+    target_link_libraries(cose_test PRIVATE ${CMAKE_THREAD_LIBS_INIT} ccfcrypto)
 
     add_unit_test(pem_test ${CMAKE_CURRENT_SOURCE_DIR}/src/crypto/test/pem.cpp)
     target_link_libraries(pem_test PRIVATE ${CMAKE_THREAD_LIBS_INIT})

cgmanifest.json

@@ -109,26 +109,6 @@
         }
       }
     },
-    {
-      "component": {
-        "type": "git",
-        "git": {
-          "repositoryUrl": "https://github.com/laurencelundblade/QCBOR",
-          "commitHash": "4ace4620d549f22c1163c5b00d3ae0c0dae1d207",
-          "tag": "v1.5.3"
-        }
-      }
-    },
-    {
-      "component": {
-        "type": "git",
-        "git": {
-          "repositoryUrl": "https://github.com/laurencelundblade/t_cose",
-          "commitHash": "64fbc64dd5982a7f75834d2b9a2a8c9ba8207776",
-          "tag": "v1.1.3"
-        }
-      }
-    },
     {
       "component": {
         "type": "git",

cmake/cose_openssl.cmake

@@ -0,0 +1,22 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the Apache 2.0 License.
+
+include(FetchContent)
+
+FetchContent_Declare(
+  Corrosion
+  GIT_REPOSITORY https://github.com/corrosion-rs/corrosion.git
+  GIT_TAG a1a1aaa057a5da656c06c3d8505b767a4e941709 # v0.5.2
+)
+FetchContent_MakeAvailable(Corrosion)
+
+corrosion_import_crate(
+  MANIFEST_PATH
+  "${CCF_DIR}/src/cose/cose_rs/Cargo.toml"
+  PROFILE
+  "release"
+  CRATES
+  "cose-rs"
+  CRATE_TYPES
+  "staticlib"
+)

cmake/crypto.cmake

@@ -40,7 +40,11 @@ target_compile_options(ccfcrypto PUBLIC ${COMPILE_LIBCXX})
 target_link_options(ccfcrypto PUBLIC ${LINK_LIBCXX})
 
 target_link_libraries(ccfcrypto PUBLIC crypto ssl evercbor)
-target_link_libraries(ccfcrypto PRIVATE t_cose)
+target_link_libraries(ccfcrypto PRIVATE ${CMAKE_BINARY_DIR}/libcose_rs.a)
+add_dependencies(ccfcrypto cargo-build_cose_rs)
+target_include_directories(
+  ccfcrypto PUBLIC $<BUILD_INTERFACE:${CCF_DIR}/src/cose>
+)
 set_property(TARGET ccfcrypto PROPERTY POSITION_INDEPENDENT_CODE ON)
 
 install(

cmake/qcbor.cmake

@@ -58,3 +58,6 @@ tdnf --snapshottime=$SOURCE_DATE_EPOCH -y install strace
 
 # For packaging
 tdnf --snapshottime=$SOURCE_DATE_EPOCH -y install rpm-build
+
+curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal --component rustfmt
+export PATH="$HOME/.cargo/bin:$PATH"

cmake/t_cose.cmake

@@ -0,0 +1,13 @@
+[package]
+name = "cose-rs"
+version = "0.1.0"
+edition = "2021"
+
+[lib]
+crate-type = ["staticlib"]
+
+[dependencies]
+cose-openssl = { git = "https://github.com/maxtropets/cose-openssl.git", branch = "f/fix-trailing-bytes" }
+
+[profile.release]
+lto = true