Move PKCS #11 submodule pointer forward. Update PKCS folder paths. (#…

…1406) * Move PKCS #11 submodule pointer forward. * Update PKCS folder paths.
aws · Nov 24, 2020 · 787b149 · 787b149
1 parent 7b4f726
commit 787b149
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 13 deletions.
diff --git a/demos/pkcs11/pkcs11_demo_management_and_rng/CMakeLists.txt b/demos/pkcs11/pkcs11_demo_management_and_rng/CMakeLists.txt
@@ -2,7 +2,7 @@ set( DEMO_NAME "pkcs11_demo_management_and_rng" )
 
 # Set path to corePKCS11 and it's third party libraries.
 set(COREPKCS11_LOCATION "${CMAKE_SOURCE_DIR}/libraries/standard/corePKCS11")
-set(CORE_PKCS11_3RDPARTY_LOCATION "${COREPKCS11_LOCATION}/3rdparty")
+set(CORE_PKCS11_3RDPARTY_LOCATION "${COREPKCS11_LOCATION}/source/dependency/3rdparty")
 
 # Include PKCS #11 library's source and header path variables.
 include( ${COREPKCS11_LOCATION}/pkcsFilePaths.cmake )

diff --git a/demos/pkcs11/pkcs11_demo_mechanisms_and_digests/CMakeLists.txt b/demos/pkcs11/pkcs11_demo_mechanisms_and_digests/CMakeLists.txt
@@ -2,7 +2,7 @@ set( DEMO_NAME "pkcs11_demo_mechanisms_and_digests" )
 
 # Set path to corePKCS11 and its third party libraries.
 set(COREPKCS11_LOCATION "${CMAKE_SOURCE_DIR}/libraries/standard/corePKCS11")
-set(CORE_PKCS11_3RDPARTY_LOCATION "${COREPKCS11_LOCATION}/3rdparty")
+set(CORE_PKCS11_3RDPARTY_LOCATION "${COREPKCS11_LOCATION}/source/dependency/3rdparty")
 
 # Include PKCS #11 library's source and header path variables.
 include( ${COREPKCS11_LOCATION}/pkcsFilePaths.cmake )

diff --git a/demos/pkcs11/pkcs11_demo_objects/CMakeLists.txt b/demos/pkcs11/pkcs11_demo_objects/CMakeLists.txt
@@ -2,8 +2,8 @@ set( DEMO_NAME "pkcs11_demo_objects" )
 
 # Set path to corePKCS11 and it's third party libraries.
 set(COREPKCS11_LOCATION "${CMAKE_SOURCE_DIR}/libraries/standard/corePKCS11")
-set(3RDPARTY_LOCATION "${CMAKE_SOURCE_DIR}/libraries/3rdparty")
-set(CORE_PKCS11_3RDPARTY_LOCATION "${COREPKCS11_LOCATION}/3rdparty")
+set(3RDPARTY_LOCATION "${CMAKE_SOURCE_DIR}/libraries/source/dependency/3rdparty")
+set(CORE_PKCS11_3RDPARTY_LOCATION "${COREPKCS11_LOCATION}/source/dependency/3rdparty")
 
 # Include PKCS #11 library's source and header path variables.
 include( ${COREPKCS11_LOCATION}/pkcsFilePaths.cmake )

diff --git a/demos/pkcs11/pkcs11_demo_objects/pkcs11_demo_objects.c b/demos/pkcs11/pkcs11_demo_objects/pkcs11_demo_objects.c
@@ -91,7 +91,7 @@
     "-----END CERTIFICATE-----"
 
 /* This function can be found in
- * corePKCS11/3rdparty/mbedtls_utils/mbedtls_utils.c.
+ * corePKCS11/source/dependency/3rdparty/mbedtls_utils/mbedtls_utils.c.
  * It will be used to convert the RSA certificate from PEM format
  * to DER format. */
 extern int convert_pem_to_der( const unsigned char * pucInput,

diff --git a/demos/pkcs11/pkcs11_demo_sign_and_verify/CMakeLists.txt b/demos/pkcs11/pkcs11_demo_sign_and_verify/CMakeLists.txt
@@ -2,8 +2,8 @@ set( DEMO_NAME "pkcs11_demo_sign_and_verify" )
 
 # Set path to corePKCS11 and it's third party libraries.
 set(COREPKCS11_LOCATION "${CMAKE_SOURCE_DIR}/libraries/standard/corePKCS11")
-set(3RDPARTY_LOCATION "${CMAKE_SOURCE_DIR}/libraries/3rdparty")
-set(CORE_PKCS11_3RDPARTY_LOCATION "${COREPKCS11_LOCATION}/3rdparty")
+set(3RDPARTY_LOCATION "${CMAKE_SOURCE_DIR}/libraries/source/dependency/3rdparty")
+set(CORE_PKCS11_3RDPARTY_LOCATION "${COREPKCS11_LOCATION}/source/dependency/3rdparty")
 
 # Include PKCS #11 library's source and header path variables.
 include( ${COREPKCS11_LOCATION}/pkcsFilePaths.cmake )

diff --git a/integration-test/pkcs11/CMakeLists.txt b/integration-test/pkcs11/CMakeLists.txt
@@ -12,7 +12,7 @@ set(project_name "pkcs11_system")
 # list the files you would like to test here
 set(real_source_files "${PKCS_SOURCES}")
 set(corePKCS11_location "${CMAKE_SOURCE_DIR}/libraries/standard/corePKCS11")
-set(CORE_PKCS11_3RDPARTY_LOCATION "${corePKCS11_location}/3rdparty")
+set(CORE_PKCS11_3RDPARTY_LOCATION "${corePKCS11_location}/source/dependency/3rdparty")
 set(test_config "test-config")
 
 file(GLOB MBEDTLS_FILES CONFIGURE_DEPENDS "${CORE_PKCS11_3RDPARTY_LOCATION}/mbedtls/library/*.c")
@@ -22,7 +22,8 @@ list(APPEND real_source_files
             ${MBEDTLS_FILES}
             ${test_config_sources}
             "${corePKCS11_location}/source/portable/posix/core_pkcs11_pal.c"
-            "${corePKCS11_location}/3rdparty/mbedtls_utils/mbedtls_utils.c"
+            "${CORE_PKCS11_3RDPARTY_LOCATION}/mbedtls_utils/mbedtls_utils.c"
+            "${CORE_PKCS11_3RDPARTY_LOCATION}/mbedtls_utils/mbedtls_error.c"
             )
 
 # list the directories the module under test includes
@@ -33,7 +34,7 @@ list(APPEND real_include_directories
             ${LOGGING_INCLUDE_DIRS}
             "${CORE_PKCS11_3RDPARTY_LOCATION}/pkcs11"
             "${CORE_PKCS11_3RDPARTY_LOCATION}/mbedtls/include"
-            "${corePKCS11_location}/3rdparty/mbedtls_utils"
+            "${CORE_PKCS11_3RDPARTY_LOCATION}/mbedtls_utils"
         )
 
 # =====================  Create UnitTest Code here (edit)  =====================
@@ -86,7 +87,13 @@ set_source_files_properties(
 )
 
 set_source_files_properties(
-    "${corePKCS11_location}/3rdparty/mbedtls_utils/mbedtls_utils.c"
+    "${CORE_PKCS11_3RDPARTY_LOCATION}/mbedtls_utils/mbedtls_utils.c"
+    PROPERTIES COMPILE_FLAGS
+    "-Wno-pedantic -Wno-error"
+)
+
+set_source_files_properties(
+    "${CORE_PKCS11_3RDPARTY_LOCATION}/mbedtls_utils/mbedtls_error.c"
     PROPERTIES COMPILE_FLAGS
     "-Wno-pedantic -Wno-error"
 )

diff --git a/integration-test/pkcs11/test-config/core_pkcs11_config.h b/integration-test/pkcs11/test-config/core_pkcs11_config.h
@@ -51,7 +51,7 @@
 #endif
 
 #ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_NONE /* PKCS #11 MBT tests will generate a lot of logs and causes parsing errors, that is why this is defaulted to NONE. */
+    #define LIBRARY_LOG_LEVEL    LOG_NONE
 #endif
 
 #include "logging_stack.h"

diff --git a/libraries/standard/corePKCS11 b/libraries/standard/corePKCS11
+33 −3		.github/workflows/ci.yml
+4 −4		.gitmodules
+2 −2		MISRA.md
+2 −0		lexicon.txt
+11 −0		manifest.yml
+1 −1		pkcsFilePaths.cmake
+2 −2		source/core_pkcs11.c
+12 −12		source/core_pki_utils.c
+0 −0		source/dependency/3rdparty/mbedtls
+0 −0		source/dependency/3rdparty/mbedtls_utils/mbedtls_error.c
+13 −8		source/dependency/3rdparty/mbedtls_utils/mbedtls_error.h
+0 −0		source/dependency/3rdparty/mbedtls_utils/mbedtls_utils.c
+0 −0		source/dependency/3rdparty/pkcs11
+87 −58		source/portable/mbedtls/core_pkcs11_mbedtls.c
+1 −1		test/CMakeLists.txt
+2 −2		test/cbmc/proofs/C_CloseSession/Makefile
+2 −2		test/cbmc/proofs/C_Finalize/Makefile
+2 −2		test/cbmc/proofs/C_GenerateRandom/Makefile
+40 −0		test/cbmc/proofs/C_GetFunctionList/C_GetFunctionList_harness.c
+21 −0		test/cbmc/proofs/C_GetFunctionList/Makefile
+20 −0		test/cbmc/proofs/C_GetFunctionList/README.md
+1 −0		test/cbmc/proofs/C_GetFunctionList/cbmc-proof.txt
+7 −0		test/cbmc/proofs/C_GetFunctionList/cbmc-viewer.json
+42 −0		test/cbmc/proofs/C_GetMechanismInfo/C_GetMechanismInfo_harness.c
+26 −0		test/cbmc/proofs/C_GetMechanismInfo/Makefile
+20 −0		test/cbmc/proofs/C_GetMechanismInfo/README.md
+1 −0		test/cbmc/proofs/C_GetMechanismInfo/cbmc-proof.txt
+7 −0		test/cbmc/proofs/C_GetMechanismInfo/cbmc-viewer.json
+53 −0		test/cbmc/proofs/C_GetSlotList/C_GetSlotList_harness.c
+25 −0		test/cbmc/proofs/C_GetSlotList/Makefile
+20 −0		test/cbmc/proofs/C_GetSlotList/README.md
+1 −0		test/cbmc/proofs/C_GetSlotList/cbmc-proof.txt
+7 −0		test/cbmc/proofs/C_GetSlotList/cbmc-viewer.json
+2 −2		test/cbmc/proofs/C_Initialize/Makefile
+2 −2		test/cbmc/proofs/C_OpenSession/Makefile
+1 −1		test/cbmc/proofs/Makefile-project-defines
+28 −28		test/unit-test/CMakeLists.txt
+18 −19		test/unit-test/config/core_pkcs11_config.h
+2 −2		test/unit-test/core_pkcs11_mbedtls_utest.c
+4 −0		tools/coverity/misra.config
+0 −30		tools/spell/README.md
+0 −96		tools/spell/ablexicon
+0 −41		tools/spell/extract-comments
+0 −152		tools/spell/find-unknown-comment-words