The big merge that makes t_cose 2.0 the main line

.github/workflows/ci.yml

@@ -23,12 +23,30 @@ jobs:
         - os-image: ubuntu-latest
           container: ubuntu:20.04
           crypto-provider: MbedTLS
-          crypto-provider-version: '2.28.0'
+          crypto-provider-version: 'v2.28.0'
+          crypto-provider-extra: ''
+          crypto-provider-build-extra: ''
 
         - os-image: ubuntu-latest
           container: ubuntu:20.04
           crypto-provider: MbedTLS
-          crypto-provider-version: '3.1.0'
+          crypto-provider-version: 'v3.1.0'
+          crypto-provider-extra: ''
+          crypto-provider-build-extra: ''
+
+        - os-image: ubuntu-latest
+          container: ubuntu:20.04
+          crypto-provider: MbedTLS
+          crypto-provider-version: 'v3.4.0'
+          crypto-provider-extra: ''
+          crypto-provider-build-extra: ''
+
+        - os-image: ubuntu-latest
+          container: ubuntu:20.04
+          crypto-provider: MbedTLS
+          crypto-provider-version: 'v3.4.0'
+          crypto-provider-extra: ''
+          crypto-provider-build-extra: 'python3 scripts/config.py set MBEDTLS_ECP_RESTARTABLE'
 
         - os-image: ubuntu-latest
           container: ubuntu:20.04
@@ -47,7 +65,8 @@ jobs:
         set -ex
         export DEBIAN_FRONTEND=noninteractive
         apt-get update
-        apt-get install -y build-essential cmake python3 ${{ matrix.c-compiler }}
+        apt-get install -y build-essential cmake python3 ${{ matrix.c-compiler }} \
+                python3-jinja2 python3-jsonschema
         echo "CC=${{ matrix.c-compiler }}" >> $GITHUB_ENV
 
     - name: Install OpenSSL
@@ -59,13 +78,14 @@ jobs:
       uses: actions/checkout@v3
       with:
         repository: ARMmbed/mbedtls
-        ref: v${{ matrix.config.crypto-provider-version }}
+        ref: ${{ matrix.config.crypto-provider-version }}
         path: mbedtls
 
     - name: Install MbedTLS
       if: matrix.config.crypto-provider == 'MbedTLS'
       run: |
         cd mbedtls
+        ${{ matrix.config.crypto-provider-build-extra }}
         make -j $(nproc)
         make install
 
@@ -86,16 +106,25 @@ jobs:
         set -ex
         mkdir build
         cd build
-        cmake -DCRYPTO_PROVIDER=${{ matrix.config.crypto-provider }} ..
+        cmake -DCRYPTO_PROVIDER=${{ matrix.config.crypto-provider }} \
+          ${{ matrix.config.crypto-provider-extra }} \
+          ${{ matrix.config.defines }} \
+          ..
         make -j $(nproc)
 
-    - name: Run OpenSSL example
-      if: matrix.config.crypto-provider == 'OpenSSL'
-      run: build/t_cose_basic_example_ossl
+    - name: Run examples
+      run: build/t_cose_examples
 
-    - name: Run MbedTLS example
-      if: matrix.config.crypto-provider == 'MbedTLS'
-      run: build/t_cose_basic_example_psa
+    - name: Run tests
+      if: matrix.config.crypto-provider == 'MbedTLS' &&
+          matrix.config.crypto-provider-version == 'v3.4.0' &&
+          matrix.config.crypto-provider-build-extra == ''
+      # This Mbed TLS version has the option of restartable ECP, however it is
+      # not turned on. In this case the restartable testcase should fail.
+      run: build/t_cose_test | grep 'restart_test_2_step FAILED'
 
     - name: Run tests
+      if: ${{ ! ( matrix.config.crypto-provider == 'MbedTLS' &&
+              matrix.config.crypto-provider-version == 'v3.4.0' &&
+              matrix.config.crypto-provider-build-extra == '' ) }}
       run: build/t_cose_test

.gitignore

@@ -54,6 +54,8 @@ dkms.conf
 # Compiled binaries
 t_cose_test
 t_cose_basic_example_ossl
+t_cose_basic_example_psa
+t_cose_encryption_example_psa
 
 # CMake build folder
 build/

CMakeLists.txt

@@ -35,7 +35,7 @@ if(CRYPTO_PROVIDER STREQUAL "MbedTLS")
 
     find_package(MbedTLS REQUIRED)
     set(CRYPTO_LIBRARY MbedTLS::MbedCrypto)
-    set(CRYPTO_COMPILE_DEFS -DT_COSE_USE_PSA_CRYPTO=1)
+    set(CRYPTO_COMPILE_DEFS -DT_COSE_USE_PSA_CRYPTO=1 ${CC_DEFINES})
     set(CRYPTO_ADAPTER_SRC crypto_adapters/t_cose_psa_crypto.c)
 
 elseif(CRYPTO_PROVIDER STREQUAL "OpenSSL")
@@ -66,6 +66,23 @@ set(T_COSE_SRC_COMMON
     src/t_cose_parameters.c
     src/t_cose_sign1_verify.c
     src/t_cose_util.c
+    src/t_cose_key.c
+    src/t_cose_sign_sign.c
+    src/t_cose_mac_compute.c
+    src/t_cose_signature_sign_main.c
+    src/t_cose_signature_sign_restart.c
+    src/t_cose_signature_sign_eddsa.c
+    src/t_cose_sign_verify.c
+    src/t_cose_mac_validate.c
+    src/t_cose_signature_verify_main.c
+    src/t_cose_signature_verify_eddsa.c
+    src/t_cose_encrypt_enc.c
+    src/t_cose_encrypt_dec.c
+    src/t_cose_recipient_dec_keywrap.c
+    src/t_cose_recipient_enc_keywrap.c
+    src/t_cose_recipient_dec_esdh.c
+    src/t_cose_recipient_enc_esdh.c
+    src/t_cose_qcbor_gap.c
 )
 
 find_package(QCBOR REQUIRED)
@@ -86,50 +103,72 @@ install(DIRECTORY inc/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
 
 if (BUILD_EXAMPLES)
 
+    set(EXAMPLE_SRC_COMMON
+        examples/examples_main.c
+        examples/print_buf.c
+        examples/signing_examples.c
+        examples/encryption_examples.c
+        examples/example_keys.c
+    )
+
     if (CRYPTO_PROVIDER STREQUAL "MbedTLS")
-        add_executable(t_cose_basic_example_psa examples/t_cose_basic_example_psa.c)
-        target_link_libraries(t_cose_basic_example_psa PRIVATE t_cose ${CRYPTO_LIBRARY})
-    elseif (CRYPTO_PROVIDER STREQUAL "OpenSSL")
-        add_executable(t_cose_basic_example_ossl examples/t_cose_basic_example_ossl.c)
-        target_link_libraries(t_cose_basic_example_ossl PRIVATE t_cose ${CRYPTO_LIBRARY})
+        set(EXAMPLE_SRC_EXTRA examples/init_keys_psa.c)
+    elseif(CRYPTO_PROVIDER STREQUAL "OpenSSL")
+        set(EXAMPLE_SRC_EXTRA examples/init_keys_ossl.c)
+    elseif(CRYPTO_PROVIDER STREQUAL "Test")
+        set(EXAMPLE_SRC_EXTRA examples/init_keys_test.c)
+    else()
+        message(FATAL_ERROR "Bug!")
     endif()
 
+    add_executable(t_cose_examples ${EXAMPLE_SRC_COMMON} ${EXAMPLE_SRC_EXTRA})
+
+    target_include_directories(t_cose_examples PRIVATE examples)
+    target_link_libraries(t_cose_examples PRIVATE t_cose ${CRYPTO_LIBRARY})
+    # Crypto defs are needed because the tests include headers from src/
+    target_compile_definitions(t_cose_examples PRIVATE ${CRYPTO_COMPILE_DEFS} ${EXAMPLE_EXTRA_DEFS})
+
 endif()
 
+
 if (BUILD_TESTS)
 
     enable_testing()
 
     set(TEST_SRC_COMMON
         main.c
         test/run_tests.c
+        test/t_cose_compute_validate_mac_test.c
+        test/t_cose_crypto_test.c
+        test/t_cose_encrypt_decrypt_test.c
         test/t_cose_make_test_messages.c
+        test/data/test_messages.c
+        test/t_cose_param_test.c
         test/t_cose_test.c
+        examples/example_keys.c
     )
 
     if (NOT CRYPTO_PROVIDER STREQUAL "Test")
         list(APPEND TEST_SRC_COMMON test/t_cose_sign_verify_test.c)
     endif()
 
     if (CRYPTO_PROVIDER STREQUAL "MbedTLS")
-        set(TEST_SRC_EXTRA test/t_cose_make_psa_test_key.c)
-        set(TEST_EXTRA_DEFS)
+        set(TEST_SRC_EXTRA examples/init_keys_psa.c)
     elseif(CRYPTO_PROVIDER STREQUAL "OpenSSL")
-        set(TEST_SRC_EXTRA test/t_cose_make_openssl_test_key.c)
-        set(TEST_EXTRA_DEFS)
+        set(TEST_SRC_EXTRA examples/init_keys_ossl.c)
     elseif(CRYPTO_PROVIDER STREQUAL "Test")
-        set(TEST_SRC_EXTRA)
+        set(TEST_SRC_EXTRA examples/init_keys_test.c)
         set(TEST_EXTRA_DEFS -DT_COSE_ENABLE_HASH_FAIL_TEST -DT_COSE_DISABLE_SIGN_VERIFY_TESTS)
     else()
         message(FATAL_ERROR "Bug!")
     endif()
 
     add_executable(t_cose_test ${TEST_SRC_COMMON} ${TEST_SRC_EXTRA})
-    target_include_directories(t_cose_test PRIVATE src test)
+    target_include_directories(t_cose_test PRIVATE src test examples)
     target_link_libraries(t_cose_test PRIVATE t_cose ${CRYPTO_LIBRARY})
     # Crypto defs are needed because the tests include headers from src/
     target_compile_definitions(t_cose_test PRIVATE ${CRYPTO_COMPILE_DEFS} ${TEST_EXTRA_DEFS})
-    
+
     add_test(NAME t_cose_test COMMAND t_cose_test)
 
 endif()