diff --git a/FreeRTOS-Plus/Demo/corePKCS11_MQTT_Mutual_Auth_Windows_Simulator/WIN32.vcxproj b/FreeRTOS-Plus/Demo/corePKCS11_MQTT_Mutual_Auth_Windows_Simulator/WIN32.vcxproj
index 82a2e156c..5429d5373 100644
--- a/FreeRTOS-Plus/Demo/corePKCS11_MQTT_Mutual_Auth_Windows_Simulator/WIN32.vcxproj
+++ b/FreeRTOS-Plus/Demo/corePKCS11_MQTT_Mutual_Auth_Windows_Simulator/WIN32.vcxproj
@@ -165,10 +165,10 @@
-
-
-
-
+
+
+
+
@@ -292,9 +292,9 @@
-
-
-
+
+
+
diff --git a/FreeRTOS-Plus/Demo/corePKCS11_MQTT_Mutual_Auth_Windows_Simulator/WIN32.vcxproj.filters b/FreeRTOS-Plus/Demo/corePKCS11_MQTT_Mutual_Auth_Windows_Simulator/WIN32.vcxproj.filters
index 9575b2447..2230d7ed0 100644
--- a/FreeRTOS-Plus/Demo/corePKCS11_MQTT_Mutual_Auth_Windows_Simulator/WIN32.vcxproj.filters
+++ b/FreeRTOS-Plus/Demo/corePKCS11_MQTT_Mutual_Auth_Windows_Simulator/WIN32.vcxproj.filters
@@ -182,16 +182,16 @@
Common
-
+
corePKCS11
-
+
corePKCS11
-
+
corePKCS11
-
+
corePKCS11
@@ -560,13 +560,13 @@
coreMQTT
-
+
corePKCS11\include
-
+
corePKCS11\include
-
+
corePKCS11\include
diff --git a/FreeRTOS-Plus/Demo/corePKCS11_MQTT_Mutual_Auth_Windows_Simulator/iot_pkcs11_config.h b/FreeRTOS-Plus/Demo/corePKCS11_MQTT_Mutual_Auth_Windows_Simulator/core_pkcs11_config.h
similarity index 96%
rename from FreeRTOS-Plus/Demo/corePKCS11_MQTT_Mutual_Auth_Windows_Simulator/iot_pkcs11_config.h
rename to FreeRTOS-Plus/Demo/corePKCS11_MQTT_Mutual_Auth_Windows_Simulator/core_pkcs11_config.h
index 73594f0d6..851f3eac9 100644
--- a/FreeRTOS-Plus/Demo/corePKCS11_MQTT_Mutual_Auth_Windows_Simulator/iot_pkcs11_config.h
+++ b/FreeRTOS-Plus/Demo/corePKCS11_MQTT_Mutual_Auth_Windows_Simulator/core_pkcs11_config.h
@@ -25,13 +25,13 @@
/**
- * @file iot_pkcs11_config.h
+ * @file core_pkcs11_config.h
* @brief PCKS#11 config options.
*/
-#ifndef _IOT_PKCS11_CONFIG_H_
-#define _IOT_PKCS11_CONFIG_H_
+#ifndef _CORE_PKCS11_CONFIG_H_
+#define _CORE_PKCS11_CONFIG_H_
#include "FreeRTOS.h"
@@ -59,12 +59,12 @@
#include "logging_stack.h"
/**
- * @brief Malloc API used by iot_pkcs11.h
+ * @brief Malloc API used by core_pkcs11.h
*/
#define PKCS11_MALLOC pvPortMalloc
/**
- * @brief Free API used by iot_pkcs11.h
+ * @brief Free API used by core_pkcs11.h
*/
#define PKCS11_FREE vPortFree
@@ -180,4 +180,4 @@
*/
#define pkcs11configLABEL_ROOT_CERTIFICATE ( "Root Cert" )
-#endif /* _AWS_PKCS11_CONFIG_H_ include guard. */
+#endif /* _CORE_PKCS11_CONFIG_H_ include guard. */
diff --git a/FreeRTOS-Plus/Demo/corePKCS11_Windows_Simulator/WIN32.vcxproj b/FreeRTOS-Plus/Demo/corePKCS11_Windows_Simulator/WIN32.vcxproj
index 2b0985c5e..6dd874eb7 100644
--- a/FreeRTOS-Plus/Demo/corePKCS11_Windows_Simulator/WIN32.vcxproj
+++ b/FreeRTOS-Plus/Demo/corePKCS11_Windows_Simulator/WIN32.vcxproj
@@ -230,10 +230,10 @@
-
-
-
-
+
+
+
+
@@ -333,9 +333,9 @@
-
-
-
+
+
+
diff --git a/FreeRTOS-Plus/Demo/corePKCS11_Windows_Simulator/WIN32.vcxproj.filters b/FreeRTOS-Plus/Demo/corePKCS11_Windows_Simulator/WIN32.vcxproj.filters
index 5c6763424..cde58d7cb 100644
--- a/FreeRTOS-Plus/Demo/corePKCS11_Windows_Simulator/WIN32.vcxproj.filters
+++ b/FreeRTOS-Plus/Demo/corePKCS11_Windows_Simulator/WIN32.vcxproj.filters
@@ -89,16 +89,16 @@
examples
-
+
corePKCS11\source
-
+
corePKCS11\source
-
+
corePKCS11\source
-
+
corePKCS11\source
@@ -382,13 +382,13 @@
examples
-
+
corePKCS11\include
-
+
corePKCS11\include
-
+
corePKCS11\include
diff --git a/FreeRTOS-Plus/Demo/corePKCS11_Windows_Simulator/iot_pkcs11_config.h b/FreeRTOS-Plus/Demo/corePKCS11_Windows_Simulator/core_pkcs11_config.h
similarity index 96%
rename from FreeRTOS-Plus/Demo/corePKCS11_Windows_Simulator/iot_pkcs11_config.h
rename to FreeRTOS-Plus/Demo/corePKCS11_Windows_Simulator/core_pkcs11_config.h
index 882bca654..449d5ca78 100644
--- a/FreeRTOS-Plus/Demo/corePKCS11_Windows_Simulator/iot_pkcs11_config.h
+++ b/FreeRTOS-Plus/Demo/corePKCS11_Windows_Simulator/core_pkcs11_config.h
@@ -24,13 +24,13 @@
*/
/**
- * @file iot_pkcs11_config.h
+ * @file core_pkcs11_config.h
* @brief PCKS#11 config options.
*/
-#ifndef _IOT_PKCS11_CONFIG_H_
-#define _IOT_PKCS11_CONFIG_H_
+#ifndef _CORE_PKCS11_CONFIG_H_
+#define _CORE_PKCS11_CONFIG_H_
#include "FreeRTOS.h"
@@ -59,12 +59,12 @@
#include "logging_stack.h"
/**
- * @brief Malloc API used by iot_pkcs11.h
+ * @brief Malloc API used by core_pkcs11.h
*/
#define PKCS11_MALLOC pvPortMalloc
/**
- * @brief Free API used by iot_pkcs11.h
+ * @brief Free API used by core_pkcs11.h
*/
#define PKCS11_FREE vPortFree
@@ -170,4 +170,4 @@
*/
#define pkcs11configLABEL_ROOT_CERTIFICATE "Root Cert"
-#endif /* _AWS_PKCS11_CONFIG_H_ include guard. */
+#endif /* _CORE_PKCS11_CONFIG_H_ */
diff --git a/FreeRTOS-Plus/Demo/corePKCS11_Windows_Simulator/examples/demo_helpers.c b/FreeRTOS-Plus/Demo/corePKCS11_Windows_Simulator/examples/demo_helpers.c
index 408ab40fe..21937f12c 100644
--- a/FreeRTOS-Plus/Demo/corePKCS11_Windows_Simulator/examples/demo_helpers.c
+++ b/FreeRTOS-Plus/Demo/corePKCS11_Windows_Simulator/examples/demo_helpers.c
@@ -31,8 +31,8 @@
#include "stdio.h"
/* PKCS #11 includes. */
-#include "iot_pkcs11_config.h"
-#include "iot_pkcs11.h"
+#include "core_pkcs11_config.h"
+#include "core_pkcs11.h"
#include "pkcs11.h"
/* mbed TLS includes. */
diff --git a/FreeRTOS-Plus/Demo/corePKCS11_Windows_Simulator/examples/demo_helpers.h b/FreeRTOS-Plus/Demo/corePKCS11_Windows_Simulator/examples/demo_helpers.h
index 648b16696..7c758325a 100644
--- a/FreeRTOS-Plus/Demo/corePKCS11_Windows_Simulator/examples/demo_helpers.h
+++ b/FreeRTOS-Plus/Demo/corePKCS11_Windows_Simulator/examples/demo_helpers.h
@@ -25,7 +25,7 @@
#ifndef _DEMO_HELPER_FUNCTIONS_
#define _DEMO_HELPER_FUNCTIONS_
-#include "iot_pkcs11.h"
+#include "core_pkcs11.h"
#include "threading_alt.h"
#include "mbedtls/pk.h"
diff --git a/FreeRTOS-Plus/Demo/corePKCS11_Windows_Simulator/examples/management_and_rng.c b/FreeRTOS-Plus/Demo/corePKCS11_Windows_Simulator/examples/management_and_rng.c
index a4ed1c0bd..740f8e74e 100644
--- a/FreeRTOS-Plus/Demo/corePKCS11_Windows_Simulator/examples/management_and_rng.c
+++ b/FreeRTOS-Plus/Demo/corePKCS11_Windows_Simulator/examples/management_and_rng.c
@@ -30,8 +30,8 @@
#include "stdio.h"
/* PKCS #11 includes. */
-#include "iot_pkcs11_config.h"
-#include "iot_pkcs11.h"
+#include "core_pkcs11_config.h"
+#include "core_pkcs11.h"
#include "pkcs11.h"
/* Demo include. */
diff --git a/FreeRTOS-Plus/Demo/corePKCS11_Windows_Simulator/examples/mechanisms_and_digests.c b/FreeRTOS-Plus/Demo/corePKCS11_Windows_Simulator/examples/mechanisms_and_digests.c
index 64325f882..c56fa2cb1 100644
--- a/FreeRTOS-Plus/Demo/corePKCS11_Windows_Simulator/examples/mechanisms_and_digests.c
+++ b/FreeRTOS-Plus/Demo/corePKCS11_Windows_Simulator/examples/mechanisms_and_digests.c
@@ -30,8 +30,8 @@
#include "stdio.h"
/* PKCS #11 includes. */
-#include "iot_pkcs11_config.h"
-#include "iot_pkcs11.h"
+#include "core_pkcs11_config.h"
+#include "core_pkcs11.h"
#include "pkcs11.h"
/* Demo includes. */
diff --git a/FreeRTOS-Plus/Demo/corePKCS11_Windows_Simulator/examples/objects.c b/FreeRTOS-Plus/Demo/corePKCS11_Windows_Simulator/examples/objects.c
index 9d649f281..0de32dd85 100644
--- a/FreeRTOS-Plus/Demo/corePKCS11_Windows_Simulator/examples/objects.c
+++ b/FreeRTOS-Plus/Demo/corePKCS11_Windows_Simulator/examples/objects.c
@@ -30,8 +30,8 @@
#include "stdio.h"
/* PKCS #11 includes. */
-#include "iot_pkcs11_config.h"
-#include "iot_pkcs11.h"
+#include "core_pkcs11_config.h"
+#include "core_pkcs11.h"
#include "pkcs11.h"
/* mbed TLS includes. */
@@ -150,7 +150,7 @@ static void prvObjectImporting( void )
CK_BYTE xSubject[] = "TestSubject";
- /* The PKCS11_CertificateTemplate_t is a custom struct defined in "iot_pkcs11.h"
+ /* The PKCS11_CertificateTemplate_t is a custom struct defined in "core_pkcs11.h"
* in order to make it easier to import a certificate. This struct will be
* populated with the parameters necessary to import the certificate into the
* Cryptoki library.
diff --git a/FreeRTOS-Plus/Demo/corePKCS11_Windows_Simulator/examples/pkcs11_demos.h b/FreeRTOS-Plus/Demo/corePKCS11_Windows_Simulator/examples/pkcs11_demos.h
index bdabddf21..935aee40f 100644
--- a/FreeRTOS-Plus/Demo/corePKCS11_Windows_Simulator/examples/pkcs11_demos.h
+++ b/FreeRTOS-Plus/Demo/corePKCS11_Windows_Simulator/examples/pkcs11_demos.h
@@ -46,7 +46,7 @@ void vPKCS11ObjectDemo( void );
* PKCS #11 can be used to sign a message, and verify the integrity of a message
* using private and public keys.
*
- * This demo will also cover the "iot_pkcs11.h" functions, and how they can be
+ * This demo will also cover the "core_pkcs11.h" functions, and how they can be
* used to make the PKCS #11 flow easier to use.
*
* Warning: This demo depends on the objects created in the objects demo.
diff --git a/FreeRTOS-Plus/Demo/corePKCS11_Windows_Simulator/examples/sign_and_verify.c b/FreeRTOS-Plus/Demo/corePKCS11_Windows_Simulator/examples/sign_and_verify.c
index c4c7c5e62..65c99a84b 100644
--- a/FreeRTOS-Plus/Demo/corePKCS11_Windows_Simulator/examples/sign_and_verify.c
+++ b/FreeRTOS-Plus/Demo/corePKCS11_Windows_Simulator/examples/sign_and_verify.c
@@ -30,10 +30,10 @@
#include "stdio.h"
/* PKCS #11 includes. */
-#include "iot_pkcs11_config.h"
-#include "iot_pkcs11.h"
+#include "core_pkcs11_config.h"
+#include "core_pkcs11.h"
#include "pkcs11.h"
-#include "iot_pki_utils.h"
+#include "core_pki_utils.h"
/* Demo includes. */
#include "demo_helpers.h"
@@ -106,7 +106,7 @@ void vPKCS11SignVerifyDemo( void )
configASSERT( pxFunctionList->C_InitToken != NULL );
configASSERT( pxFunctionList->C_GetTokenInfo != NULL );
- /* Instead of using the vStart helper, we will use the "iot_pkcs11.h"
+ /* Instead of using the vStart helper, we will use the "core_pkcs11.h"
* functions that help wrap around some common PKCS #11 use cases.
*
* This function will:
diff --git a/FreeRTOS-Plus/Source/Application-Protocols/platform/freertos/transport/include/tls_freertos_pkcs11.h b/FreeRTOS-Plus/Source/Application-Protocols/platform/freertos/transport/include/tls_freertos_pkcs11.h
index 6fe88b6be..44f53fbc3 100644
--- a/FreeRTOS-Plus/Source/Application-Protocols/platform/freertos/transport/include/tls_freertos_pkcs11.h
+++ b/FreeRTOS-Plus/Source/Application-Protocols/platform/freertos/transport/include/tls_freertos_pkcs11.h
@@ -71,7 +71,7 @@
#include "mbedtls/pk_internal.h"
/* PKCS #11 includes. */
-#include "iot_pkcs11.h"
+#include "core_pkcs11.h"
/**
* @brief Secured connection context.
diff --git a/FreeRTOS-Plus/Source/Application-Protocols/platform/freertos/transport/src/tls_freertos_pkcs11.c b/FreeRTOS-Plus/Source/Application-Protocols/platform/freertos/transport/src/tls_freertos_pkcs11.c
index ab24a8db5..18e5f8959 100644
--- a/FreeRTOS-Plus/Source/Application-Protocols/platform/freertos/transport/src/tls_freertos_pkcs11.c
+++ b/FreeRTOS-Plus/Source/Application-Protocols/platform/freertos/transport/src/tls_freertos_pkcs11.c
@@ -48,10 +48,10 @@
#include "mbedtls_error.h"
/* PKCS #11 includes. */
-#include "iot_pkcs11_config.h"
-#include "iot_pkcs11.h"
+#include "core_pkcs11_config.h"
+#include "core_pkcs11.h"
#include "pkcs11.h"
-#include "iot_pki_utils.h"
+#include "core_pki_utils.h"
/*-----------------------------------------------------------*/
diff --git a/FreeRTOS-Plus/Source/corePKCS11 b/FreeRTOS-Plus/Source/corePKCS11
index 66720bea5..40bef7663 160000
--- a/FreeRTOS-Plus/Source/corePKCS11
+++ b/FreeRTOS-Plus/Source/corePKCS11
@@ -1 +1 @@
-Subproject commit 66720bea5941edf6549bd524215156cd01b74e06
+Subproject commit 40bef76639fc5e85a7ec188a31a45cf72d5fb6a0