From e313e286df3e70dfed2a9c434b041bc4dc9710ca Mon Sep 17 00:00:00 2001
From: Carl Lundin <53273776+lundinc2@users.noreply.github.com>
Date: Thu, 19 Nov 2020 09:17:18 -0800
Subject: [PATCH] Bump corePKCS11 submodule  (#412)

* Move PKCS submodule forward.

* Use common mbed code.
---
 .../WIN32.vcxproj                             | 344 +++++++++---------
 FreeRTOS-Plus/Source/corePKCS11               |   2 +-
 2 files changed, 180 insertions(+), 166 deletions(-)

diff --git a/FreeRTOS-Plus/Demo/corePKCS11_Windows_Simulator/WIN32.vcxproj b/FreeRTOS-Plus/Demo/corePKCS11_Windows_Simulator/WIN32.vcxproj
index 04c5c4a40..1dbcd5bfa 100644
--- a/FreeRTOS-Plus/Demo/corePKCS11_Windows_Simulator/WIN32.vcxproj
+++ b/FreeRTOS-Plus/Demo/corePKCS11_Windows_Simulator/WIN32.vcxproj
@@ -58,7 +58,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\FreeRTOS-Plus\Source\Utilities\logging;..\..\..\FreeRTOS-Plus\Source\corePKCS11\source\include;..\..\..\FreeRTOS-Plus\Source\corePKCS11\source\portable\mbedtls\include;..\..\..\FreeRTOS-Plus\Source\corePKCS11\3rdparty\pkcs11;..\..\..\FreeRTOS-Plus\Source\corePKCS11\3rdparty\mbedtls\include;..\..\..\FreeRTOS-Plus\Source\corePKCS11\3rdparty\mbedtls_utils;..\..\..\FreeRTOS\Source\include;..\..\..\FreeRTOS\Source\portable\MSVC-MingW;examples;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\FreeRTOS-Plus\Source\Utilities\logging;..\..\..\FreeRTOS-Plus\Source\corePKCS11\source\include;..\..\..\FreeRTOS-Plus\Source\corePKCS11\source\portable\mbedtls\include;..\..\..\FreeRTOS-Plus\Source\corePKCS11\3rdparty\pkcs11;..\..\ThirdParty\mbedtls\include;..\..\..\FreeRTOS-Plus\Source\corePKCS11\3rdparty\mbedtls_utils;..\..\..\FreeRTOS\Source\include;..\..\..\FreeRTOS\Source\portable\MSVC-MingW;examples;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;WINVER=0x400;_CRT_SECURE_NO_WARNINGS;MBEDTLS_CONFIG_FILE="aws_mbedtls_config.h";CONFIG_MEDTLS_USE_AFR_MEMORY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -152,85 +152,92 @@
     <ClInclude Include="..\..\..\FreeRTOS-Plus\Source\Utilities\logging\logging.h" />
     <ClInclude Include="..\..\..\FreeRTOS-Plus\Source\Utilities\logging\logging_levels.h" />
     <ClInclude Include="..\..\..\FreeRTOS-Plus\Source\Utilities\logging\logging_stack.h" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\aes.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\aesni.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\arc4.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\aria.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\asn1parse.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\asn1write.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\base64.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\bignum.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\blowfish.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\camellia.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\ccm.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\certs.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\chacha20.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\chachapoly.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\cipher.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\cipher_wrap.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\cmac.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\ctr_drbg.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\debug.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\des.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\dhm.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\ecdh.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\ecdsa.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\ecjpake.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\ecp.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\ecp_curves.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\entropy.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\entropy_poll.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\error.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\gcm.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\havege.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\hkdf.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\hmac_drbg.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\md.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\md2.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\md4.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\md5.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\md_wrap.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\memory_buffer_alloc.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\net_sockets.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\nist_kw.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\oid.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\padlock.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\pem.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\pk.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\pkcs11.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\pkcs12.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\pkcs5.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\pkparse.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\pkwrite.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\pk_wrap.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\platform.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\platform_util.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\poly1305.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\ripemd160.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\rsa.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\rsa_internal.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\sha1.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\sha256.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\sha512.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\ssl_cache.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\ssl_ciphersuites.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\ssl_cli.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\ssl_cookie.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\ssl_srv.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\ssl_ticket.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\ssl_tls.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\threading.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\timing.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\version.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\version_features.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\x509.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\x509write_crt.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\x509write_csr.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\x509_create.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\x509_crl.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\x509_crt.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\x509_csr.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\xtea.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\aes.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\aesni.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\arc4.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\aria.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\asn1parse.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\asn1write.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\base64.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\bignum.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\blowfish.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\camellia.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ccm.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\certs.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\chacha20.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\chachapoly.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\cipher.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\cipher_wrap.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\cmac.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ctr_drbg.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\debug.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\des.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\dhm.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ecdh.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ecdsa.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ecjpake.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ecp.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ecp_curves.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\entropy.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\entropy_poll.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\error.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\gcm.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\havege.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\hkdf.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\hmac_drbg.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\md.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\md2.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\md4.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\md5.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\memory_buffer_alloc.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\net_sockets.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\nist_kw.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\oid.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\padlock.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\pem.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\pk.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\pkcs11.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\pkcs12.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\pkcs5.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\pkparse.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\pkwrite.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\pk_wrap.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\platform.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\platform_util.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\poly1305.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\psa_crypto.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\psa_crypto_driver_wrappers.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\psa_crypto_se.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\psa_crypto_slot_management.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\psa_crypto_storage.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\psa_its_file.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ripemd160.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\rsa.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\rsa_internal.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\sha1.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\sha256.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\sha512.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ssl_cache.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ssl_ciphersuites.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ssl_cli.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ssl_cookie.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ssl_msg.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ssl_srv.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ssl_ticket.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ssl_tls.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ssl_tls13_keys.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\threading.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\timing.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\version.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\version_features.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\x509.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\x509write_crt.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\x509write_csr.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\x509_create.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\x509_crl.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\x509_crt.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\x509_csr.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\xtea.c" />
     <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls_utils\mbedtls_error.c" />
     <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls_utils\mbedtls_utils.c" />
     <ClCompile Include="..\..\Source\corePKCS11\source\core_pkcs11.c" />
@@ -254,84 +261,96 @@
     <ClInclude Include="..\..\..\FreeRTOS\Source\include\stack_macros.h" />
     <ClInclude Include="..\..\..\FreeRTOS\Source\include\task.h" />
     <ClInclude Include="..\..\..\FreeRTOS\Source\include\timers.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\aes.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\aesni.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\arc4.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\aria.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\asn1.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\asn1write.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\base64.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\bignum.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\blowfish.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\bn_mul.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\camellia.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\ccm.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\certs.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\chacha20.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\chachapoly.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\check_config.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\cipher.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\cipher_internal.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\cmac.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\compat-1.3.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\config.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\ctr_drbg.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\debug.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\des.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\dhm.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\ecdh.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\ecdsa.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\ecjpake.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\ecp.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\ecp_internal.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\entropy.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\entropy_poll.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\error.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\gcm.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\havege.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\hkdf.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\hmac_drbg.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\md.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\md2.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\md4.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\md5.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\md_internal.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\memory_buffer_alloc.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\net.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\net_sockets.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\nist_kw.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\oid.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\padlock.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\pem.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\pk.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\pkcs11.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\pkcs12.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\pkcs5.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\pk_internal.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\platform.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\platform_time.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\platform_util.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\poly1305.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\ripemd160.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\rsa.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\rsa_internal.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\sha1.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\sha256.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\sha512.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\ssl.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\ssl_cache.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\ssl_ciphersuites.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\ssl_cookie.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\ssl_internal.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\ssl_ticket.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\threading.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\timing.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\version.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\x509.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\x509_crl.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\x509_crt.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\x509_csr.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\xtea.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\aes.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\aesni.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\arc4.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\aria.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\asn1.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\asn1write.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\base64.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\bignum.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\blowfish.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\bn_mul.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\camellia.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\ccm.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\certs.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\chacha20.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\chachapoly.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\check_config.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\cipher.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\cipher_internal.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\cmac.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\compat-1.3.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\config.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\ctr_drbg.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\debug.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\des.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\dhm.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\ecdh.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\ecdsa.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\ecjpake.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\ecp.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\ecp_internal.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\entropy.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\entropy_poll.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\error.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\gcm.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\havege.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\hkdf.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\hmac_drbg.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\md.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\md2.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\md4.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\md5.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\md_internal.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\memory_buffer_alloc.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\net.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\net_sockets.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\nist_kw.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\oid.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\padlock.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\pem.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\pk.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\pkcs11.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\pkcs12.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\pkcs5.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\pk_internal.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\platform.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\platform_time.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\platform_util.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\poly1305.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\psa_util.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\ripemd160.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\rsa.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\rsa_internal.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\sha1.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\sha256.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\sha512.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\ssl.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\ssl_cache.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\ssl_ciphersuites.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\ssl_cookie.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\ssl_internal.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\ssl_ticket.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\threading.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\timing.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\version.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\x509.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\x509_crl.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\x509_crt.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\x509_csr.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\xtea.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\common.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\psa_crypto_core.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\psa_crypto_driver_wrappers.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\psa_crypto_invasive.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\psa_crypto_its.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\psa_crypto_se.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\psa_crypto_service_integration.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\psa_crypto_slot_management.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\psa_crypto_storage.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\ssl_invasive.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\ssl_tls13_keys.h" />
     <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls_utils\mbedtls_error.h" />
     <ClInclude Include="..\..\Source\corePKCS11\3rdparty\pkcs11\pkcs11.h" />
     <ClInclude Include="..\..\Source\corePKCS11\3rdparty\pkcs11\pkcs11f.h" />
@@ -346,13 +365,8 @@
     <ClInclude Include="FreeRTOSConfig.h" />
     <ClInclude Include="pkcs11_demo_config.h" />
   </ItemGroup>
-  <ItemGroup>
-    <Text Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\CMakeLists.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\Makefile" />
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
+
diff --git a/FreeRTOS-Plus/Source/corePKCS11 b/FreeRTOS-Plus/Source/corePKCS11
index 40bef7663..efc4b34b0 160000
--- a/FreeRTOS-Plus/Source/corePKCS11
+++ b/FreeRTOS-Plus/Source/corePKCS11
@@ -1 +1 @@
-Subproject commit 40bef76639fc5e85a7ec188a31a45cf72d5fb6a0
+Subproject commit efc4b34b03f1aef39af7fb771c46a541f0eeb2e3