Rename PKCS files to core. (#344)

* Rename PKCS files to core.
* Pin latest corePKCS11 release.
This commit is contained in:
Carl Lundin 2020-10-16 13:38:25 -07:00 committed by GitHub
parent 806d51caf0
commit 15a7337ee0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 60 additions and 60 deletions

View file

@ -165,10 +165,10 @@
<ClCompile Include="..\..\..\FreeRTOS-Plus\Source\Application-Protocols\coreMQTT\source\core_mqtt_state.c" /> <ClCompile Include="..\..\..\FreeRTOS-Plus\Source\Application-Protocols\coreMQTT\source\core_mqtt_state.c" />
<ClCompile Include="..\..\..\FreeRTOS-Plus\Source\Application-Protocols\coreMQTT\source\core_mqtt.c" /> <ClCompile Include="..\..\..\FreeRTOS-Plus\Source\Application-Protocols\coreMQTT\source\core_mqtt.c" />
<ClCompile Include="..\..\Source\Application-Protocols\platform\freertos\transport\src\tls_freertos_pkcs11.c" /> <ClCompile Include="..\..\Source\Application-Protocols\platform\freertos\transport\src\tls_freertos_pkcs11.c" />
<ClCompile Include="..\..\Source\corePKCS11\source\iot_pkcs11.c" /> <ClCompile Include="..\..\Source\corePKCS11\source\core_pkcs11.c" />
<ClCompile Include="..\..\Source\corePKCS11\source\iot_pki_utils.c" /> <ClCompile Include="..\..\Source\corePKCS11\source\core_pki_utils.c" />
<ClCompile Include="..\..\Source\corePKCS11\source\portable\mbedtls\iot_pkcs11_mbedtls.c" /> <ClCompile Include="..\..\Source\corePKCS11\source\portable\mbedtls\core_pkcs11_mbedtls.c" />
<ClCompile Include="..\..\Source\corePKCS11\source\portable\windows\iot_pkcs11_pal.c" /> <ClCompile Include="..\..\Source\corePKCS11\source\portable\windows\core_pkcs11_pal.c" />
<ClCompile Include="..\..\ThirdParty\mbedtls\library\aes.c" /> <ClCompile Include="..\..\ThirdParty\mbedtls\library\aes.c" />
<ClCompile Include="..\..\ThirdParty\mbedtls\library\aesni.c" /> <ClCompile Include="..\..\ThirdParty\mbedtls\library\aesni.c" />
<ClCompile Include="..\..\ThirdParty\mbedtls\library\arc4.c" /> <ClCompile Include="..\..\ThirdParty\mbedtls\library\arc4.c" />
@ -292,9 +292,9 @@
<ClInclude Include="..\..\..\Source\Application-Protocols\coreMQTT\source\include\core_mqtt_serializer.h" /> <ClInclude Include="..\..\..\Source\Application-Protocols\coreMQTT\source\include\core_mqtt_serializer.h" />
<ClInclude Include="..\..\..\Source\Application-Protocols\coreMQTT\source\include\core_mqtt_state.h" /> <ClInclude Include="..\..\..\Source\Application-Protocols\coreMQTT\source\include\core_mqtt_state.h" />
<ClInclude Include="..\..\..\Source\Application-Protocols\coreMQTT\source\include\core_mqtt.h" /> <ClInclude Include="..\..\..\Source\Application-Protocols\coreMQTT\source\include\core_mqtt.h" />
<ClInclude Include="..\..\Source\corePKCS11\source\include\iot_pkcs11.h" /> <ClInclude Include="..\..\Source\corePKCS11\source\include\core_pkcs11.h" />
<ClInclude Include="..\..\Source\corePKCS11\source\include\iot_pkcs11_pal.h" /> <ClInclude Include="..\..\Source\corePKCS11\source\include\core_pkcs11_pal.h" />
<ClInclude Include="..\..\Source\corePKCS11\source\include\iot_pki_utils.h" /> <ClInclude Include="..\..\Source\corePKCS11\source\include\core_pki_utils.h" />
<ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\aes.h" /> <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\aes.h" />
<ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\aesni.h" /> <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\aesni.h" />
<ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\arc4.h" /> <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\arc4.h" />

View file

@ -182,16 +182,16 @@
<ClCompile Include="..\coreMQTT_Windows_Simulator\Common\demo_logging.c"> <ClCompile Include="..\coreMQTT_Windows_Simulator\Common\demo_logging.c">
<Filter>Common</Filter> <Filter>Common</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\Source\corePKCS11\source\iot_pkcs11.c"> <ClCompile Include="..\..\Source\corePKCS11\source\core_pkcs11.c">
<Filter>corePKCS11</Filter> <Filter>corePKCS11</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\Source\corePKCS11\source\iot_pki_utils.c"> <ClCompile Include="..\..\Source\corePKCS11\source\core_pki_utils.c">
<Filter>corePKCS11</Filter> <Filter>corePKCS11</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\Source\corePKCS11\source\portable\mbedtls\iot_pkcs11_mbedtls.c"> <ClCompile Include="..\..\Source\corePKCS11\source\portable\mbedtls\core_pkcs11_mbedtls.c">
<Filter>corePKCS11</Filter> <Filter>corePKCS11</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\Source\corePKCS11\source\portable\windows\iot_pkcs11_pal.c"> <ClCompile Include="..\..\Source\corePKCS11\source\portable\windows\core_pkcs11_pal.c">
<Filter>corePKCS11</Filter> <Filter>corePKCS11</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\ThirdParty\mbedtls\library\aes.c"> <ClCompile Include="..\..\ThirdParty\mbedtls\library\aes.c">
@ -560,13 +560,13 @@
<ClInclude Include="core_mqtt_config.h"> <ClInclude Include="core_mqtt_config.h">
<Filter>coreMQTT</Filter> <Filter>coreMQTT</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\Source\corePKCS11\source\include\iot_pkcs11.h"> <ClInclude Include="..\..\Source\corePKCS11\source\include\core_pkcs11.h">
<Filter>corePKCS11\include</Filter> <Filter>corePKCS11\include</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\Source\corePKCS11\source\include\iot_pkcs11_pal.h"> <ClInclude Include="..\..\Source\corePKCS11\source\include\core_pkcs11_pal.h">
<Filter>corePKCS11\include</Filter> <Filter>corePKCS11\include</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\Source\corePKCS11\source\include\iot_pki_utils.h"> <ClInclude Include="..\..\Source\corePKCS11\source\include\core_pki_utils.h">
<Filter>corePKCS11\include</Filter> <Filter>corePKCS11\include</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\ThirdParty\mbedtls\library\common.h"> <ClInclude Include="..\..\ThirdParty\mbedtls\library\common.h">

View file

@ -25,13 +25,13 @@
/** /**
* @file iot_pkcs11_config.h * @file core_pkcs11_config.h
* @brief PCKS#11 config options. * @brief PCKS#11 config options.
*/ */
#ifndef _IOT_PKCS11_CONFIG_H_ #ifndef _CORE_PKCS11_CONFIG_H_
#define _IOT_PKCS11_CONFIG_H_ #define _CORE_PKCS11_CONFIG_H_
#include "FreeRTOS.h" #include "FreeRTOS.h"
@ -59,12 +59,12 @@
#include "logging_stack.h" #include "logging_stack.h"
/** /**
* @brief Malloc API used by iot_pkcs11.h * @brief Malloc API used by core_pkcs11.h
*/ */
#define PKCS11_MALLOC pvPortMalloc #define PKCS11_MALLOC pvPortMalloc
/** /**
* @brief Free API used by iot_pkcs11.h * @brief Free API used by core_pkcs11.h
*/ */
#define PKCS11_FREE vPortFree #define PKCS11_FREE vPortFree
@ -180,4 +180,4 @@
*/ */
#define pkcs11configLABEL_ROOT_CERTIFICATE ( "Root Cert" ) #define pkcs11configLABEL_ROOT_CERTIFICATE ( "Root Cert" )
#endif /* _AWS_PKCS11_CONFIG_H_ include guard. */ #endif /* _CORE_PKCS11_CONFIG_H_ include guard. */

View file

@ -230,10 +230,10 @@
<ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\xtea.c" /> <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\xtea.c" />
<ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls_utils\mbedtls_error.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\3rdparty\mbedtls_utils\mbedtls_utils.c" />
<ClCompile Include="..\..\Source\corePKCS11\source\iot_pkcs11.c" /> <ClCompile Include="..\..\Source\corePKCS11\source\core_pkcs11.c" />
<ClCompile Include="..\..\Source\corePKCS11\source\iot_pki_utils.c" /> <ClCompile Include="..\..\Source\corePKCS11\source\core_pki_utils.c" />
<ClCompile Include="..\..\Source\corePKCS11\source\portable\mbedtls\iot_pkcs11_mbedtls.c" /> <ClCompile Include="..\..\Source\corePKCS11\source\portable\mbedtls\core_pkcs11_mbedtls.c" />
<ClCompile Include="..\..\Source\corePKCS11\source\portable\windows\iot_pkcs11_pal.c" /> <ClCompile Include="..\..\Source\corePKCS11\source\portable\windows\core_pkcs11_pal.c" />
<ClCompile Include="examples\demo_helpers.c" /> <ClCompile Include="examples\demo_helpers.c" />
<ClCompile Include="examples\management_and_rng.c" /> <ClCompile Include="examples\management_and_rng.c" />
<ClCompile Include="examples\objects.c" /> <ClCompile Include="examples\objects.c" />
@ -333,9 +333,9 @@
<ClInclude Include="..\..\Source\corePKCS11\3rdparty\pkcs11\pkcs11.h" /> <ClInclude Include="..\..\Source\corePKCS11\3rdparty\pkcs11\pkcs11.h" />
<ClInclude Include="..\..\Source\corePKCS11\3rdparty\pkcs11\pkcs11f.h" /> <ClInclude Include="..\..\Source\corePKCS11\3rdparty\pkcs11\pkcs11f.h" />
<ClInclude Include="..\..\Source\corePKCS11\3rdparty\pkcs11\pkcs11t.h" /> <ClInclude Include="..\..\Source\corePKCS11\3rdparty\pkcs11\pkcs11t.h" />
<ClInclude Include="..\..\Source\corePKCS11\source\include\iot_pkcs11.h" /> <ClInclude Include="..\..\Source\corePKCS11\source\include\core_pkcs11.h" />
<ClInclude Include="..\..\Source\corePKCS11\source\include\iot_pkcs11_pal.h" /> <ClInclude Include="..\..\Source\corePKCS11\source\include\core_pkcs11_pal.h" />
<ClInclude Include="..\..\Source\corePKCS11\source\include\iot_pki_utils.h" /> <ClInclude Include="..\..\Source\corePKCS11\source\include\core_pki_utils.h" />
<ClInclude Include="..\..\Source\corePKCS11\source\portable\mbedtls\threading_alt.h" /> <ClInclude Include="..\..\Source\corePKCS11\source\portable\mbedtls\threading_alt.h" />
<ClInclude Include="..\Common\Logging\logging_levels.h" /> <ClInclude Include="..\Common\Logging\logging_levels.h" />
<ClInclude Include="..\Common\Logging\logging_stack.h" /> <ClInclude Include="..\Common\Logging\logging_stack.h" />

View file

@ -89,16 +89,16 @@
<ClCompile Include="examples\sign_and_verify.c"> <ClCompile Include="examples\sign_and_verify.c">
<Filter>examples</Filter> <Filter>examples</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\Source\corePKCS11\source\portable\mbedtls\iot_pkcs11_mbedtls.c"> <ClCompile Include="..\..\Source\corePKCS11\source\portable\mbedtls\core_pkcs11_mbedtls.c">
<Filter>corePKCS11\source</Filter> <Filter>corePKCS11\source</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\Source\corePKCS11\source\iot_pkcs11.c"> <ClCompile Include="..\..\Source\corePKCS11\source\core_pkcs11.c">
<Filter>corePKCS11\source</Filter> <Filter>corePKCS11\source</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\Source\corePKCS11\source\iot_pki_utils.c"> <ClCompile Include="..\..\Source\corePKCS11\source\core_pki_utils.c">
<Filter>corePKCS11\source</Filter> <Filter>corePKCS11\source</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\Source\corePKCS11\source\portable\windows\iot_pkcs11_pal.c"> <ClCompile Include="..\..\Source\corePKCS11\source\portable\windows\core_pkcs11_pal.c">
<Filter>corePKCS11\source</Filter> <Filter>corePKCS11\source</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls_utils\mbedtls_error.c"> <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls_utils\mbedtls_error.c">
@ -382,13 +382,13 @@
<ClInclude Include="examples\demo_helpers.h"> <ClInclude Include="examples\demo_helpers.h">
<Filter>examples</Filter> <Filter>examples</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\Source\corePKCS11\source\include\iot_pkcs11.h"> <ClInclude Include="..\..\Source\corePKCS11\source\include\core_pkcs11.h">
<Filter>corePKCS11\include</Filter> <Filter>corePKCS11\include</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\Source\corePKCS11\source\include\iot_pkcs11_pal.h"> <ClInclude Include="..\..\Source\corePKCS11\source\include\core_pkcs11_pal.h">
<Filter>corePKCS11\include</Filter> <Filter>corePKCS11\include</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\Source\corePKCS11\source\include\iot_pki_utils.h"> <ClInclude Include="..\..\Source\corePKCS11\source\include\core_pki_utils.h">
<Filter>corePKCS11\include</Filter> <Filter>corePKCS11\include</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\Source\corePKCS11\source\portable\mbedtls\threading_alt.h"> <ClInclude Include="..\..\Source\corePKCS11\source\portable\mbedtls\threading_alt.h">

View file

@ -24,13 +24,13 @@
*/ */
/** /**
* @file iot_pkcs11_config.h * @file core_pkcs11_config.h
* @brief PCKS#11 config options. * @brief PCKS#11 config options.
*/ */
#ifndef _IOT_PKCS11_CONFIG_H_ #ifndef _CORE_PKCS11_CONFIG_H_
#define _IOT_PKCS11_CONFIG_H_ #define _CORE_PKCS11_CONFIG_H_
#include "FreeRTOS.h" #include "FreeRTOS.h"
@ -59,12 +59,12 @@
#include "logging_stack.h" #include "logging_stack.h"
/** /**
* @brief Malloc API used by iot_pkcs11.h * @brief Malloc API used by core_pkcs11.h
*/ */
#define PKCS11_MALLOC pvPortMalloc #define PKCS11_MALLOC pvPortMalloc
/** /**
* @brief Free API used by iot_pkcs11.h * @brief Free API used by core_pkcs11.h
*/ */
#define PKCS11_FREE vPortFree #define PKCS11_FREE vPortFree
@ -170,4 +170,4 @@
*/ */
#define pkcs11configLABEL_ROOT_CERTIFICATE "Root Cert" #define pkcs11configLABEL_ROOT_CERTIFICATE "Root Cert"
#endif /* _AWS_PKCS11_CONFIG_H_ include guard. */ #endif /* _CORE_PKCS11_CONFIG_H_ */

View file

@ -31,8 +31,8 @@
#include "stdio.h" #include "stdio.h"
/* PKCS #11 includes. */ /* PKCS #11 includes. */
#include "iot_pkcs11_config.h" #include "core_pkcs11_config.h"
#include "iot_pkcs11.h" #include "core_pkcs11.h"
#include "pkcs11.h" #include "pkcs11.h"
/* mbed TLS includes. */ /* mbed TLS includes. */

View file

@ -25,7 +25,7 @@
#ifndef _DEMO_HELPER_FUNCTIONS_ #ifndef _DEMO_HELPER_FUNCTIONS_
#define _DEMO_HELPER_FUNCTIONS_ #define _DEMO_HELPER_FUNCTIONS_
#include "iot_pkcs11.h" #include "core_pkcs11.h"
#include "threading_alt.h" #include "threading_alt.h"
#include "mbedtls/pk.h" #include "mbedtls/pk.h"

View file

@ -30,8 +30,8 @@
#include "stdio.h" #include "stdio.h"
/* PKCS #11 includes. */ /* PKCS #11 includes. */
#include "iot_pkcs11_config.h" #include "core_pkcs11_config.h"
#include "iot_pkcs11.h" #include "core_pkcs11.h"
#include "pkcs11.h" #include "pkcs11.h"
/* Demo include. */ /* Demo include. */

View file

@ -30,8 +30,8 @@
#include "stdio.h" #include "stdio.h"
/* PKCS #11 includes. */ /* PKCS #11 includes. */
#include "iot_pkcs11_config.h" #include "core_pkcs11_config.h"
#include "iot_pkcs11.h" #include "core_pkcs11.h"
#include "pkcs11.h" #include "pkcs11.h"
/* Demo includes. */ /* Demo includes. */

View file

@ -30,8 +30,8 @@
#include "stdio.h" #include "stdio.h"
/* PKCS #11 includes. */ /* PKCS #11 includes. */
#include "iot_pkcs11_config.h" #include "core_pkcs11_config.h"
#include "iot_pkcs11.h" #include "core_pkcs11.h"
#include "pkcs11.h" #include "pkcs11.h"
/* mbed TLS includes. */ /* mbed TLS includes. */
@ -150,7 +150,7 @@ static void prvObjectImporting( void )
CK_BYTE xSubject[] = "TestSubject"; 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 * 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 * populated with the parameters necessary to import the certificate into the
* Cryptoki library. * Cryptoki library.

View file

@ -46,7 +46,7 @@ void vPKCS11ObjectDemo( void );
* PKCS #11 can be used to sign a message, and verify the integrity of a message * PKCS #11 can be used to sign a message, and verify the integrity of a message
* using private and public keys. * 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. * used to make the PKCS #11 flow easier to use.
* *
* Warning: This demo depends on the objects created in the objects demo. * Warning: This demo depends on the objects created in the objects demo.

View file

@ -30,10 +30,10 @@
#include "stdio.h" #include "stdio.h"
/* PKCS #11 includes. */ /* PKCS #11 includes. */
#include "iot_pkcs11_config.h" #include "core_pkcs11_config.h"
#include "iot_pkcs11.h" #include "core_pkcs11.h"
#include "pkcs11.h" #include "pkcs11.h"
#include "iot_pki_utils.h" #include "core_pki_utils.h"
/* Demo includes. */ /* Demo includes. */
#include "demo_helpers.h" #include "demo_helpers.h"
@ -106,7 +106,7 @@ void vPKCS11SignVerifyDemo( void )
configASSERT( pxFunctionList->C_InitToken != NULL ); configASSERT( pxFunctionList->C_InitToken != NULL );
configASSERT( pxFunctionList->C_GetTokenInfo != 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. * functions that help wrap around some common PKCS #11 use cases.
* *
* This function will: * This function will:

View file

@ -71,7 +71,7 @@
#include "mbedtls/pk_internal.h" #include "mbedtls/pk_internal.h"
/* PKCS #11 includes. */ /* PKCS #11 includes. */
#include "iot_pkcs11.h" #include "core_pkcs11.h"
/** /**
* @brief Secured connection context. * @brief Secured connection context.

View file

@ -48,10 +48,10 @@
#include "mbedtls_error.h" #include "mbedtls_error.h"
/* PKCS #11 includes. */ /* PKCS #11 includes. */
#include "iot_pkcs11_config.h" #include "core_pkcs11_config.h"
#include "iot_pkcs11.h" #include "core_pkcs11.h"
#include "pkcs11.h" #include "pkcs11.h"
#include "iot_pki_utils.h" #include "core_pki_utils.h"
/*-----------------------------------------------------------*/ /*-----------------------------------------------------------*/

@ -1 +1 @@
Subproject commit 66720bea5941edf6549bd524215156cd01b74e06 Subproject commit 40bef76639fc5e85a7ec188a31a45cf72d5fb6a0