Update mbedtls submodule (#119)

FreeRTOS · Jul 24, 2021 · d6a5191 · d6a5191
1 parent c4c517f
commit d6a5191
Show file tree

Hide file tree

Showing 50 changed files with 84 additions and 60 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -20,7 +20,7 @@ jobs:
           -DCMAKE_BUILD_TYPE=Debug \
           -DBUILD_CLONE_SUBMODULES=ON \
           -DSYSTEM_TESTS=1 \
-          -DCMAKE_C_FLAGS='-Wall -Wextra -DNDEBUG'
+          -DCMAKE_C_FLAGS='-Wall -Wextra -DNDEBUG -DLIBRARY_LOG_LEVEL=LOG_DEBUG'
           make -C build/ all
       - name: System Tests
         run: |

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # Change Log for corePKCS11 Library
 
-## v3.0.2 (July 2021)
+## v3.1.0 (July 2021)
+- [#119](https://github.com/FreeRTOS/corePKCS11/pull/119) Update mbedTLS submodule to [v2.26.0](https://github.com/ARMmbed/mbedtls/tree/v2.26.0).
 * [#118](https://github.com/FreeRTOS/corePKCS11/pull/118) Update version numbers and add C++ header guards
 * [#116](https://github.com/FreeRTOS/corePKCS11/pull/116) Remove redundant mbedtls error sources
 * [#115](https://github.com/FreeRTOS/corePKCS11/pull/115) Update broken links to MISRA in documentation

diff --git a/README.md b/README.md
@@ -35,7 +35,7 @@ A list of all the configurations and their default values are defined in the dox
 
 ### Platform Prerequisites
 
-- For building the library, **CMake 3.13.0 or later** and a **C90 compiler**.
+- For building the library, **CMake 3.13.0 or later** and a **C99 compiler**.
 - For running unit tests, Ruby 2.0.0 or later is additionally required for the CMock test framework (that we use).
 - For running the coverage target, gcov is additionally required.
 

diff --git a/docs/doxygen/config.doxyfile b/docs/doxygen/config.doxyfile
@@ -38,7 +38,7 @@ PROJECT_NAME = "corePKCS11"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = "v3.0.2"
+PROJECT_NUMBER         = "v3.1.0"
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

diff --git a/manifest.yml b/manifest.yml
@@ -1,10 +1,10 @@
 name : "corePKCS11"
-version: "v3.0.2"
+version: "v3.1.0"
 description: |
   "Software implementation of the PKCS #11 standard.\n"
 dependencies:
   - name : "mbedtls"
-    version: "v2.16.8"
+    version: "v2.26.0"
     repository:
       type: "git"
       url: "https://github.com/ARMmbed/mbedtls/"

diff --git a/source/core_pkcs11.c b/source/core_pkcs11.c
@@ -1,5 +1,5 @@
 /*
- * corePKCS11 v3.0.2
+ * corePKCS11 v3.1.0
  * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of

diff --git a/source/core_pki_utils.c b/source/core_pki_utils.c
@@ -1,5 +1,5 @@
 /*
- * corePKCS11 v3.0.2
+ * corePKCS11 v3.1.0
  * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of

diff --git a/source/dependency/3rdparty/mbedtls b/source/dependency/3rdparty/mbedtls
diff --git a/source/include/core_pkcs11.h b/source/include/core_pkcs11.h
@@ -1,5 +1,5 @@
 /*
- * corePKCS11 v3.0.2
+ * corePKCS11 v3.1.0
  * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of

diff --git a/source/include/core_pkcs11_pal.h b/source/include/core_pkcs11_pal.h
@@ -1,5 +1,5 @@
 /*
- * corePKCS11 v3.0.2
+ * corePKCS11 v3.1.0
  * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of

diff --git a/source/include/core_pki_utils.h b/source/include/core_pki_utils.h
@@ -1,5 +1,5 @@
 /*
- * corePKCS11 v3.0.2
+ * corePKCS11 v3.1.0
  * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of

diff --git a/source/portable/mbedtls/core_pkcs11_mbedtls.c b/source/portable/mbedtls/core_pkcs11_mbedtls.c
@@ -1,5 +1,5 @@
 /*
- * corePKCS11 v3.0.2
+ * corePKCS11 v3.1.0
  * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -1,15 +1,10 @@
 cmake_minimum_required ( VERSION 3.13.0 )
 project ( "corePKCS11 unit test"
-          VERSION 3.0.1
           LANGUAGES C )
 
 # Allow the project to be organized into folders.
 set_property( GLOBAL PROPERTY USE_FOLDERS ON )
 
-# Use C90.
-set( CMAKE_C_STANDARD 90 )
-set( CMAKE_C_STANDARD_REQUIRED ON )
-
 # Do not allow in-source build.
 if( ${PROJECT_SOURCE_DIR} STREQUAL ${PROJECT_BINARY_DIR} )
     message( FATAL_ERROR "In-source build is not allowed. Please build in a separate directory, such as ${PROJECT_SOURCE_DIR}/build." )
@@ -41,6 +36,9 @@ add_library( coverity_analysis
 # Build corePKCS11 library target without custom config dependency.
 target_compile_definitions( coverity_analysis PUBLIC -DMBEDTLS_CONFIG_FILE="aws_mbedtls_config.h" )
 
+# Build corePKCS11 library with gnuC90 standard due to mbedtls compatbility issues.
+target_compile_options( coverity_analysis PUBLIC -std=gnu90 )
+
 # corePKCS11 public include path.
 target_include_directories( coverity_analysis PUBLIC ${PKCS_INCLUDE_PUBLIC_DIRS} ${MODULE_ROOT_DIR}/source/dependency/3rdparty/mbedtls/include ${MODULE_ROOT_DIR}/source/dependency/3rdparty/mbedtls_utils ${MODULE_ROOT_DIR}/test/unit-test/config )
 
@@ -69,11 +67,6 @@ endif()
 # defining test targets with add_test()
 enable_testing()
 
-# We do this to swap out the default mbed TLS config for one geared towards the
-# unit tests.
-add_compile_definitions( MBEDTLS_CONFIG_FILE="aws_mbedtls_config.h" )
-
-
 # Add build targets for CMock and Unit, required for unit testing.
 add_cmock_targets()
 

diff --git a/test/cbmc/proofs/C_CloseSession/C_CloseSession_harness.c b/test/cbmc/proofs/C_CloseSession/C_CloseSession_harness.c
@@ -1,5 +1,5 @@
 /*
- * corePKCS11 v3.0.2
+ * corePKCS11 v3.1.0
  * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of

diff --git a/test/cbmc/proofs/C_CreateObject/C_CreateObject_harness.c b/test/cbmc/proofs/C_CreateObject/C_CreateObject_harness.c
@@ -1,5 +1,5 @@
 /*
- * corePKCS11 v3.0.2
+ * corePKCS11 v3.1.0
  * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of

diff --git a/test/cbmc/proofs/C_DestroyObject/C_DestroyObject_harness.c b/test/cbmc/proofs/C_DestroyObject/C_DestroyObject_harness.c
@@ -1,5 +1,5 @@
 /*
- * corePKCS11 v3.0.2
+ * corePKCS11 v3.1.0
  * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of

diff --git a/test/cbmc/proofs/C_DigestFinal/C_DigestFinal_harness.c b/test/cbmc/proofs/C_DigestFinal/C_DigestFinal_harness.c
@@ -1,5 +1,5 @@
 /*
- * corePKCS11 v3.0.2
+ * corePKCS11 v3.1.0
  * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of

diff --git a/test/cbmc/proofs/C_DigestInit/C_DigestInit_harness.c b/test/cbmc/proofs/C_DigestInit/C_DigestInit_harness.c
@@ -1,5 +1,5 @@
 /*
- * corePKCS11 v3.0.2
+ * corePKCS11 v3.1.0
  * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of

diff --git a/test/cbmc/proofs/C_DigestUpdate/C_DigestUpdate_harness.c b/test/cbmc/proofs/C_DigestUpdate/C_DigestUpdate_harness.c
@@ -1,5 +1,5 @@
 /*
- * corePKCS11 v3.0.2
+ * corePKCS11 v3.1.0
  * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of

diff --git a/test/cbmc/proofs/C_Finalize/C_Finalize_harness.c b/test/cbmc/proofs/C_Finalize/C_Finalize_harness.c
@@ -1,5 +1,5 @@
 /*
- * corePKCS11 v3.0.2
+ * corePKCS11 v3.1.0
  * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of

diff --git a/test/cbmc/proofs/C_FindObjects/C_FindObjects_harness.c b/test/cbmc/proofs/C_FindObjects/C_FindObjects_harness.c
@@ -1,5 +1,5 @@
 /*
- * corePKCS11 v3.0.2
+ * corePKCS11 v3.1.0
  * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of

diff --git a/test/cbmc/proofs/C_FindObjectsFinal/C_FindObjectsFinal_harness.c b/test/cbmc/proofs/C_FindObjectsFinal/C_FindObjectsFinal_harness.c
@@ -1,5 +1,5 @@
 /*
- * corePKCS11 v3.0.2
+ * corePKCS11 v3.1.0
  * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of

diff --git a/test/cbmc/proofs/C_FindObjectsInit/C_FindObjectsInit_harness.c b/test/cbmc/proofs/C_FindObjectsInit/C_FindObjectsInit_harness.c
@@ -1,5 +1,5 @@
 /*
- * corePKCS11 v3.0.2
+ * corePKCS11 v3.1.0
  * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of

diff --git a/test/cbmc/proofs/C_GenerateKeyPair/C_GenerateKeyPair_harness.c b/test/cbmc/proofs/C_GenerateKeyPair/C_GenerateKeyPair_harness.c
@@ -1,5 +1,5 @@
 /*
- * corePKCS11 v3.0.2
+ * corePKCS11 v3.1.0
  * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of

diff --git a/test/cbmc/proofs/C_GenerateRandom/C_GenerateRandom_harness.c b/test/cbmc/proofs/C_GenerateRandom/C_GenerateRandom_harness.c
@@ -1,5 +1,5 @@
 /*
- * corePKCS11 v3.0.2
+ * corePKCS11 v3.1.0
  * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of

diff --git a/test/cbmc/proofs/C_GetAttributeValue/C_GetAttributeValue_harness.c b/test/cbmc/proofs/C_GetAttributeValue/C_GetAttributeValue_harness.c
@@ -1,5 +1,5 @@
 /*
- * corePKCS11 v3.0.2
+ * corePKCS11 v3.1.0
  * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of

diff --git a/test/cbmc/proofs/C_GetFunctionList/C_GetFunctionList_harness.c b/test/cbmc/proofs/C_GetFunctionList/C_GetFunctionList_harness.c
@@ -1,5 +1,5 @@
 /*
- * corePKCS11 v3.0.2
+ * corePKCS11 v3.1.0
  * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of

diff --git a/test/cbmc/proofs/C_GetMechanismInfo/C_GetMechanismInfo_harness.c b/test/cbmc/proofs/C_GetMechanismInfo/C_GetMechanismInfo_harness.c
@@ -1,5 +1,5 @@
 /*
- * corePKCS11 v3.0.2
+ * corePKCS11 v3.1.0
  * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of

diff --git a/test/cbmc/proofs/C_GetSlotList/C_GetSlotList_harness.c b/test/cbmc/proofs/C_GetSlotList/C_GetSlotList_harness.c
@@ -1,5 +1,5 @@
 /*
- * corePKCS11 v3.0.2
+ * corePKCS11 v3.1.0
  * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of

diff --git a/test/cbmc/proofs/C_Initialize/C_Initialize_harness.c b/test/cbmc/proofs/C_Initialize/C_Initialize_harness.c
@@ -1,5 +1,5 @@
 /*
- * corePKCS11 v3.0.2
+ * corePKCS11 v3.1.0
  * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of

diff --git a/test/cbmc/proofs/C_OpenSession/C_OpenSession_harness.c b/test/cbmc/proofs/C_OpenSession/C_OpenSession_harness.c
@@ -1,5 +1,5 @@
 /*
- * corePKCS11 v3.0.2
+ * corePKCS11 v3.1.0
  * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of

diff --git a/test/cbmc/proofs/C_Sign/C_Sign_harness.c b/test/cbmc/proofs/C_Sign/C_Sign_harness.c
@@ -1,5 +1,5 @@
 /*
- * corePKCS11 v3.0.2
+ * corePKCS11 v3.1.0
  * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of

diff --git a/test/cbmc/proofs/C_SignInit/C_SignInit_harness.c b/test/cbmc/proofs/C_SignInit/C_SignInit_harness.c
@@ -1,5 +1,5 @@
 /*
- * corePKCS11 v3.0.2
+ * corePKCS11 v3.1.0
  * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of

diff --git a/test/cbmc/proofs/C_Verify/C_Verify_harness.c b/test/cbmc/proofs/C_Verify/C_Verify_harness.c
@@ -1,5 +1,5 @@
 /*
- * corePKCS11 v3.0.2
+ * corePKCS11 v3.1.0
  * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of

diff --git a/test/cbmc/proofs/C_VerifyInit/C_VerifyInit_harness.c b/test/cbmc/proofs/C_VerifyInit/C_VerifyInit_harness.c
@@ -1,5 +1,5 @@
 /*
- * corePKCS11 v3.0.2
+ * corePKCS11 v3.1.0
  * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of

diff --git a/...ofs/PKI_mbedTLSSignatureToPkcs11Signature/PKI_mbedTLSSignatureToPkcs11Signature_harness.c b/...ofs/PKI_mbedTLSSignatureToPkcs11Signature/PKI_mbedTLSSignatureToPkcs11Signature_harness.c
@@ -1,5 +1,5 @@
 /*
- * corePKCS11 v3.0.2
+ * corePKCS11 v3.1.0
  * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of

diff --git a/...ofs/PKI_pkcs11SignatureTombedTLSSignature/PKI_pkcs11SignatureTombedTLSSignature_harness.c b/...ofs/PKI_pkcs11SignatureTombedTLSSignature/PKI_pkcs11SignatureTombedTLSSignature_harness.c
@@ -1,5 +1,5 @@
 /*
- * corePKCS11 v3.0.2
+ * corePKCS11 v3.1.0
  * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of

diff --git a/...ppendSHA256AlgorithmIdentifierSequence/vAppendSHA256AlgorithmIdentifierSequence_harness.c b/...ppendSHA256AlgorithmIdentifierSequence/vAppendSHA256AlgorithmIdentifierSequence_harness.c
@@ -1,5 +1,5 @@
 /*
- * corePKCS11 v3.0.2
+ * corePKCS11 v3.1.0
  * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of

diff --git a/test/cbmc/proofs/xFindObjectWithLabelAndClass/xFindObjectWithLabelAndClass_harness.c b/test/cbmc/proofs/xFindObjectWithLabelAndClass/xFindObjectWithLabelAndClass_harness.c
@@ -1,5 +1,5 @@
 /*
- * corePKCS11 v3.0.2
+ * corePKCS11 v3.1.0
  * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of

diff --git a/test/cbmc/proofs/xGetSlotList/xGetSlotList_harness.c b/test/cbmc/proofs/xGetSlotList/xGetSlotList_harness.c
@@ -1,5 +1,5 @@
 /*
- * corePKCS11 v3.0.2
+ * corePKCS11 v3.1.0
  * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of

diff --git a/test/cbmc/proofs/xInitializePKCS11/xInitializePKCS11_harness.c b/test/cbmc/proofs/xInitializePKCS11/xInitializePKCS11_harness.c
@@ -1,5 +1,5 @@
 /*
- * corePKCS11 v3.0.2
+ * corePKCS11 v3.1.0
  * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of

diff --git a/test/cbmc/proofs/xInitializePkcs11Session/xInitializePkcs11Session_harness.c b/test/cbmc/proofs/xInitializePkcs11Session/xInitializePkcs11Session_harness.c
@@ -1,5 +1,5 @@
 /*
- * corePKCS11 v3.0.2
+ * corePKCS11 v3.1.0
  * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of

diff --git a/test/cbmc/proofs/xInitializePkcs11Token/xInitializePkcs11Token_harness.c b/test/cbmc/proofs/xInitializePkcs11Token/xInitializePkcs11Token_harness.c
@@ -1,5 +1,5 @@
 /*
- * corePKCS11 v3.0.2
+ * corePKCS11 v3.1.0
  * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of

diff --git a/test/cbmc/stubs/mbedtls_stubs.c b/test/cbmc/stubs/mbedtls_stubs.c
@@ -1,5 +1,5 @@
 /*
- * corePKCS11 v3.0.2
+ * corePKCS11 v3.1.0
  * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of

diff --git a/test/system-test/CMakeLists.txt b/test/system-test/CMakeLists.txt
@@ -57,10 +57,11 @@ create_real_library(${real_name}
                     # Empty mock name as create_real_library needs the 4th argument.
                     ""
         )
+
 target_compile_definitions(
     ${real_name}
     PUBLIC
-        -DMBEDTLS_CONFIG_FILE="mbedtls_config.h"
+    MBEDTLS_CONFIG_FILE="mbedtls_config.h"
 )
 
 list(APPEND stest_link_list
@@ -112,8 +113,14 @@ set_source_files_properties(
     "-Wno-pedantic -Wno-error"
 )
 
+set_source_files_properties(
+    ${MBEDTLS_FILES}
+    PROPERTY C_STANDARD
+    gnu90
+)
+
 set_source_files_properties(
     ${MBEDTLS_FILES_INCLUDES}
-    PROPERTIES COMPILE_FLAGS
-    "-Wno-pedantic"
+    PROPERTY C_STANDARD
+    gnu90
 )