diff --git a/.gitallowed b/.gitallowed new file mode 100644 index 00000000000..168e9f1e08e --- /dev/null +++ b/.gitallowed @@ -0,0 +1,24 @@ +(?# Floating point numbers) +[0-9]+\.[0-9]+ + +(?# Long integer literals) +[0-9]+L + +(?# 2^64-1) +18446744073709551615 + +(?# 2^64) +18446744073709551616 + +(?# From http parser test) +0GPHKXSJQ826RK7GZEB2 + +(?# From uint parse test) +18446744073709551615 +10000000000000000000 +9223372036854775807G + +(?# Found in:) +(?# esp-idf/components/nghttp/nghttp2/third-party/http-parser/test.c) +(?# Part of the URL to the page on dan brown) +0SHYY5BZXN3KR20BNFAY diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000000..725e3a5544d --- /dev/null +++ b/.gitattributes @@ -0,0 +1,110 @@ +#common settings that generally should always be used with your language specific settings + +# Auto detect text files and perform LF normalization +# http://davidlaing.com/2012/09/19/customise-your-gitattributes-to-become-a-git-ninja/ +* text=auto + +# +# The above will handle all files NOT found below +# + +# Documents +*.doc diff=astextplain +*.DOC diff=astextplain +*.docx diff=astextplain +*.DOCX diff=astextplain +*.dot diff=astextplain +*.DOT diff=astextplain +*.pdf diff=astextplain +*.PDF diff=astextplain +*.rtf diff=astextplain +*.RTF diff=astextplain +*.md text +*.adoc text +*.textile text +*.mustache text +*.csv text +*.tab text +*.tsv text +*.sql text + +# Graphics +*.png binary +*.jpg binary +*.jpeg binary +*.gif binary +*.tif binary +*.tiff binary +*.ico binary +# SVG treated as an asset (binary) by default. If you want to treat it as text, +# comment-out the following line and uncomment the line after. +*.svg binary +#*.svg text +*.eps binary + +#sources +*.c text +*.cc text +*.cxx text +*.cpp text +*.c++ text +*.hpp text +*.h text +*.h++ text +*.hh text + +# Compiled Object files +*.slo binary +*.lo binary +*.o binary +*.obj binary + +# Precompiled Headers +*.gch binary +*.pch binary + +# Compiled Dynamic libraries +*.so binary +*.dylib binary +*.dll binary + +# Compiled Static libraries +*.lai binary +*.la binary +*.a binary +*.lib binary + +# Executables +*.exe binary +*.out binary +*.app binary + + +# Basic .gitattributes for a python repo. + +# Source files +# ============ +*.pxd text +*.py text +*.py3 text +*.pyw text +*.pyx text + +# Binary files +# ============ +*.db binary +*.p binary +*.pkl binary +*.pyc binary +*.pyd binary +*.pyo binary + +# Note: .db, .p, and .pkl files are associated +# with the python modules ``pickle``, ``dbm.*``, +# ``shelve``, ``marshal``, ``anydbm``, & ``bsddb`` +# (among others). + +*.sh text +make text +makefile text +*.mk text diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000000..6230eef9fe4 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +# Ignore uncrustify backups +*.unc* +doc/html/* diff --git a/.gitmessage b/.gitmessage new file mode 100644 index 00000000000..00f09a0a1d6 --- /dev/null +++ b/.gitmessage @@ -0,0 +1,48 @@ + +# : # 50-char limit ######### +# 72-character lines for description ################################### + +# Why: + +# Related Issues: + +# References: + +# Run git config commit.template .gitmessage +# Use git commit when committing files, and this template will be used. + +# Example commit message: +# chore: Add commit message template + +# Capitalize subject line. +# Write capitalized imperative statement with no period for subject +# List details of significant changes below the subject line +# Write details as capitalized imperative statements +# Provide the below sections for further context + +# Why: + +# A short imperative subject helps when viewing the log, especially when +# viewing one-line formatted logs. Clear writing of what changed helps +# give a clean understanding of context when reading blame messages and +# when looking at a specific commit. + +# Related Issues: +# Link to related issue numbers (hyper link if applicable), e.g.: +# git issue 123 + +# References: +# List relevant references e.g.: +# https://chris.beams.io/posts/git-commit/ + +# Type can be +# chore (updating grunt tasks etc; no production code change) +# docs (changes to documentation, comments. No logic change) +# feat (New feature) +# fix (Bug fix, or other change related to tracked issue) +# merge (Merge of one branch into another, no other change) +# refactor (refactoring production code) +# revert (Revert of a previous commit, no other change) +# style (formatting, missing semi colons, etc; no code change) +# test (adding or refactoring tests; no production code change) +# tool (adding or refactoring tools; no production code change) diff --git a/CHANGELOG.md b/CHANGELOG.md index 71fc353e7e1..a8f28586f45 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,76 @@ # Change Log for Amazon FreeRTOS +## V1.4.3 11/07/2018 +### New Features + +#### New Board: Xilinx Zynq MicroZed +- Update Amazon FreeRTOS with port files, demo projects, and tests for the Xilinx Zynq MicroZed. + +### Updates + +#### mbedTLS Library +- Upgrade to mbedTLS version 2.13.1. + +#### FreeRTOS+POSIX V1.0.1 +- Minor bug fixes. + +#### FreeRTOS+TCP V2.0.8 +- Update the Zynq portable layer for receive descriptor alignment. + +#### PKCS #11 Updates +Applications calling into PKCS #11 functions directly (rather than using indirectly via an Amazon provided secure sockets or TLS layer) may experience breaking changes. These changes have been made as part of an on-going effort to more closely align the PKCS #11 implementation with the PKCS #11 standard, respond to feedback from users and partners, and move towards a smoother prototype-to-production workflow. + +##### mbedTLS-based PKCS #11 +- C_Initialize has been modified to handle initialization of randomness in an effort to minimize entropy generation (or seed access) everytime sessions are created and destroyed. To protect random values, thread safety has been enabled in mbedTLS. +- C_SignInit and C_VerifyInit have been modified to utilize the key handle that is passed in, rather than the first key found in order to comply with the PKCS #11 standard. +- C_FindObject APIs will no longer instantiate keys from the aws_clientcredential_keys.h header file if keys are not found. This removes the dependency of PKCS #11 on values that will be unique per-device (a transition step for enabling production-scale provisioning). Note that calling vDevModeKeyProvisioning() is now necessary to provision the device. +- C_FindObject PKCS #11 objects may be looked up by CKA_LABEL in order to provide a standard-compliant object lookup. Note that pkcs11configFILE_NAME_* configurations have been removed from aws_pkcs11_config.h, see aws_pkcs11.h for pkcs11configLABEL_* defines to access labels, and aws_pkcs11_pal.c for pkcs11palFILE_NAME_* defines. +- C_FindObject and C_GetAttributeValue accept different attribute arguments. +- C_CreateObject requires DER encoded certificates and keys instead of PEM formatted and object attributes required for creating objects have changed. Note that vDevModeKeyProvisioning() has been updated to supply required attributes and convert inputs from DER to PEM if necessary. +- C_GenerateKeyPair now stores keys in non-volatile memory. +- C_Finalize is no longer invoked by helper functions to prevent threads from interfering with each other's PKCS #11 instances. +- Some error codes have been changes to better match the PKCS #11 standard. +- aws_tls.c and PKCS #11 AFQP tests have updates to reflect these changes. + - mbedTLS-based PKCS #11 V1.0.5 + - TLS V1.1.3 + +##### PKCS #11 PAL for mbedTLS-based PKCS #11 +- Breaking changes were made to PAL PKCS #11 functions in order to transition from file-centric API to object handle and object label based API. + - PKCS #11 PAL for ESP32-DevKitC ESP-WROVER-KIT V1.0.1 + - PKCS #11 PAL for XMC4800 IoT Kit V1.0.1 + - PKCS #11 PAL for Curiosity PIC32MZEF V1.0.4 + - PKCS #11 PAL for LPC54018 IoT Module V1.0.3 + - PKCS #11 PAL for Windows Simulator V1.0.3 + - PKCS #11 PAL for STM32L4 Discovery kit IoT node V1.0.3 + - PKCS #11 PAL for Xilinx Zynq MicroZed V1.0.0 (new) + +##### PKCS #11 for CC3220SF-LAUNCHXL +- Updates to match behavior of mbedTLS-based PKCS #11. +- mbedTLS added to support conversion between DER and PEM objects. Note that after provisioning the device, mbedTLS and provisiong PKCS #11 functions may be removed to reduce code size. + - PKCS #11 PAL for CC3220SF-LAUNCHXL V1.0.3 + +##### OTA PAL Updates +- The OTA PALs for the Curiosity PIC32MZEF and ESP32-DevKitC ESP-WROVER-KIT boards have been modified to utilize PKCS #11 API to retrieve code signing keys, rather than calling into PKCS #11 PAL functions. + - OTA PAL for Curiosity PIC32MZEF V1.0.1 + - OTA PAL for ESP32-DevKitC ESP-WROVER-KIT V1.0.1 + +#### Secure Socket for FreeRTOS+TCP V1.1.4 +- Minor update to handle PKCS #11 error codes. +- Formatting updates. + +#### Secure Sockets for Infineon XMC4800 IoT Kit V1.0.1 +- Fix the license header from Secure Socket to Secure Sockets. + +#### Secure Sockets for STM32L4 Discovery kit IoT node V1.0.0 Beta 4 +- Bug fix to support Amazon Trust Services endpoints. For more information, please see https://aws.amazon.com/blogs/iot/aws-iot-core-ats-endpoints/. + +#### Secure Sockets for CC3220SF-LAUNCHXL V1.0.5 +- Remove duplicate file name definitions. See aws_secure_sockets_config.h for file name defines. + +#### Shadow V1.0.5 +- Minor bug fixes. + + ## V1.4.2 10/17/2018 ### New Features @@ -8,12 +79,6 @@ Update Amazon FreeRTOS with port files, demo projects, and tests for the Infineo ### Updates -#### Add checks in the OTA agent to ignore new OTA jobs while in self-test mode -Add a filter to the OTA agent to ignore new OTA jobs until a self-test succeeds. - -#### Align digital signature metadata to quad-word boundaries for Microchip boards -Update the starting addresses of cryptographic signatures used in Microchip PIC32MZEF projects to use quad-word boundaries for the purposes of facilitating Flash memory operations. - #### Update pthread Implementation in ESP-IDF Incorporate an update to Espressif's ESP-IDF which improves the implementation of pthread. @@ -139,10 +204,10 @@ This release includes version 1.0.0 of FreeRTOS+POSIX. FreeRTOS+POSIX is a POSI #### MQTT Agent V1.1.2 - Move MQTT metrics to agent -#### mbedTLS-based PKCS#11 V1.0.3 +#### mbedTLS-based PKCS #11 V1.0.3 - Reduce the number of warnings generated -#### PKCS#11 for LPC54018 IoT Module V1.0.1 +#### PKCS #11 for LPC54018 IoT Module V1.0.1 - Change project baudrate setting to resolve AFQP test failures #### Secure Sockets for NXP54018_IoT_Module V1.0.0 Beta 3 @@ -190,11 +255,11 @@ This release includes version 1.0.0 of FreeRTOS+POSIX. FreeRTOS+POSIX is a POSI #### FreeRTOS+TCP V2.0.4 - Add Espressif ESP32 network interface support. -#### mbedTLS-based PKCS#11 V1.0.3 +#### mbedTLS-based PKCS #11 V1.0.3 - Implement C_DigestInit, C_DigestUpdate, and C_DigestFinal for SHA-256. - Implement C_GenerateKeyPair for non-persistent ECDSA P256. -#### PKCS#11 for ESP32-DevKitC ESP-WROVER-KIT V1.0.0 +#### PKCS #11 for ESP32-DevKitC ESP-WROVER-KIT V1.0.0 - Add support for Espressif's ESP32-DevKitC and ESP-WROVER-KIT. #### Wi-Fi STM32L4 Discovery kit IoT node V1.0.2 @@ -235,7 +300,7 @@ This release includes version 1.0.0 of FreeRTOS+POSIX. FreeRTOS+POSIX is a POSI mqttconfigENABLE_SUBSCRIPTION_MANAGEMENT as 0. #### OTA PAL for Curiosity PIC32MZEF V0.9.1 - - Update for PKCS#11 PAL layer API changes. + - Update for PKCS #11 PAL layer API changes. #### OTA PAL for Windows Simulator V0.9.2 - Minor restructuring of file locations. @@ -246,32 +311,32 @@ This release includes version 1.0.0 of FreeRTOS+POSIX. FreeRTOS+POSIX is a POSI #### OTA Agent V0.9.4 - Minor restructuring of file locations. -#### mbedTLS-based PKCS#11 V1.0.2 - - Combine the mbedTLS based PKCS#11 implementation from Curiosity PIC32MZEF, +#### mbedTLS-based PKCS #11 V1.0.2 + - Combine the mbedTLS based PKCS #11 implementation from Curiosity PIC32MZEF, LPC54018 IoT Module, Windows Simulator, and STM32L4 Discovery kit IoT node into a single file. - Add support for public key verification of signatures. - Fix to free context structures on session failure. - Update C_OpenSession to use CKF_SERIAL_SESSION flag. -#### PKCS#11 for Curiosity PIC32MZEF V1.0.2 +#### PKCS #11 for Curiosity PIC32MZEF V1.0.2 - Create port specific functions for certificate and key access: PKCS11_PAL_SaveFile(), PKCS11_PAL_ReadFile(), PKCS11_PAL_ReleaseFileData(). -#### PKCS#11 for LPC54018 IoT Module V1.0.1 +#### PKCS #11 for LPC54018 IoT Module V1.0.1 - Create port specific functions for certificate and key access: PKCS11_PAL_SaveFile(), PKCS11_PAL_ReadFile(), PKCS11_PAL_ReleaseFileData(). -#### PKCS#11 PAL for Windows Simulator V1.0.2 +#### PKCS #11 PAL for Windows Simulator V1.0.2 - Create port specific functions for certificate and key access: PKCS11_PAL_SaveFile(), PKCS11_PAL_ReadFile(), PKCS11_PAL_ReleaseFileData(). -#### PKCS#11 for STM32L4 Discovery kit IoT node V1.0.1 +#### PKCS #11 for STM32L4 Discovery kit IoT node V1.0.1 - Create port specific functions for certificate and key access: PKCS11_PAL_SaveFile(), PKCS11_PAL_ReadFile(), PKCS11_PAL_ReleaseFileData(). -#### PKCS#11 for CC3220SF-LAUNCHXL V1.0.2 - - PKCS#11 implementation for TI based on mbedTLS moved into this file. +#### PKCS #11 for CC3220SF-LAUNCHXL V1.0.2 + - PKCS #11 implementation for TI based on mbedTLS moved into this file. #### Secure Socket for FreeRTOS+TCP V1.1.2 - Combine Secure Sockets implementation for Curiosity PIC32MZEF and Windows @@ -298,7 +363,7 @@ This release includes version 1.0.0 of FreeRTOS+POSIX. FreeRTOS+POSIX is a POSI #### TLS V1.1.1 - Support AWS IoT Just-in-Time Registration (JITR) by sending optional client-issuer certificate. - - Use CKF_SERIAL_SESSION flag with PKCS#11. + - Use CKF_SERIAL_SESSION flag with PKCS #11. #### Wi-Fi for Curiosity PIC32MZEF V1.0.3 - Update for setting the MAC Address in WIFI_On() by using new FreeRTOS+TCP @@ -339,7 +404,7 @@ This release includes version 1.0.0 of FreeRTOS+POSIX. FreeRTOS+POSIX is a POSI #### OTA PAL for Curiosity PIC32MZEF V0.9.0 - Beta release of the OTA Update support for the Microchip Curiosity PIC32MZEF. -#### PKCS#11 for Curiosity_PIC32MZEF V1.0.1 +#### PKCS #11 for Curiosity_PIC32MZEF V1.0.1 - Add support for the management of OTA update code signing keys. #### Wi-Fi for Curiosity PIC32MZEF V1.0.1 @@ -364,7 +429,7 @@ This release includes version 1.0.0 of FreeRTOS+POSIX. FreeRTOS+POSIX is a POSI #### Amazon FreeRTOS OTA PAL for CC3220SF-LAUNCHXL V0.9.2 - Update to support NULL OTA file handles. -#### PKCS#11 for CC3220SF-LAUNCHXL V1.0.1 +#### PKCS #11 for CC3220SF-LAUNCHXL V1.0.1 - Add a dummy variable to a previously empty structure to fix IAR compiler errors. #### Secure Socket for Windows Simulator V1.1.1 @@ -399,7 +464,7 @@ This release includes version 1.0.0 of FreeRTOS+POSIX. FreeRTOS+POSIX is a POSI is received. - Rename some files. -#### PKCS#11 for Windows Simulator +#### PKCS #11 for Windows Simulator - Add developer mode key provisioning support. #### Secure Socket for Curiosity PIC32MZEF V1.0.1 @@ -443,7 +508,7 @@ This release includes version 1.0.0 of FreeRTOS+POSIX. FreeRTOS+POSIX is a POSI #### OTA Agent V0.9.0 - Beta release of OTA Update library for Amazon FreeRTOS. Includes support for the Texas Instruments CC3220SF-LAUNCHXL and Windows Simulator. -#### PKCS#11 for Curiosity PIC32MZEF V1.0.0 Beta 1 +#### PKCS #11 for Curiosity PIC32MZEF V1.0.0 Beta 1 - Add support for the Microchip Curiosity PIC32MZEF. #### Secure Socket for Curiosity PIC32MZEF V1.0.0 diff --git a/LICENSE b/LICENSE index 9bfc82cbca9..9e2f3185f26 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2017 Amazon Web Services +Copyright (C) 2017 Amazon.com, Inc. or its affiliates. All Rights Reserved. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index 22b1a108a32..44486e4bbcc 100644 --- a/README.md +++ b/README.md @@ -26,6 +26,9 @@ The following MCU boards are supported for Amazon FreeRTOS: 6. **Infineon** - [Infineon XMC4800 IoT Connectivity Kit](https://www.infineon.com/connectivitykit) * [Getting Started Guide](https://docs.aws.amazon.com/freertos/latest/userguide/getting_started_infineon.html) * IDE: [DAVE](https://infineoncommunity.com/dave-download_ID645) +7. **Xilinx** - [Xilinx MicroZed](http://www.zedboard.org/product/microzed-iiot-bundle-afreertos) + * [Getting Started Guide](https://docs.aws.amazon.com/freertos/latest/userguide/getting_started_xilinx.html) + * IDE: [Xilinx SDK](https://www.xilinx.com/products/design-tools/embedded-software/sdk.html) **Windows Simulator** To evaluate Amazon FreeRTOS without using MCU-based hardware, you can use the Windows Simulator. diff --git a/demos/common/defender/aws_defender_demo.c b/demos/common/defender/aws_defender_demo.c index d94cb6dba48..163e82a0661 100644 --- a/demos/common/defender/aws_defender_demo.c +++ b/demos/common/defender/aws_defender_demo.c @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS Device Defender Demo V1.4.2 + * Amazon FreeRTOS Device Defender Demo V1.4.3 * Copyright (C) 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/demos/common/demo_runner/aws_demo_runner.c b/demos/common/demo_runner/aws_demo_runner.c index 25171c4b63f..5ba45ea9aaa 100644 --- a/demos/common/demo_runner/aws_demo_runner.c +++ b/demos/common/demo_runner/aws_demo_runner.c @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2017 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/demos/common/devmode_key_provisioning/aws_dev_mode_key_provisioning.c b/demos/common/devmode_key_provisioning/aws_dev_mode_key_provisioning.c index fdd31bdfa77..a7bcac45cc4 100644 --- a/demos/common/devmode_key_provisioning/aws_dev_mode_key_provisioning.c +++ b/demos/common/devmode_key_provisioning/aws_dev_mode_key_provisioning.c @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2017 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of @@ -44,6 +44,7 @@ /* PKCS#11 includes. */ #include "aws_pkcs11.h" +#include "aws_pkcs11_config.h" /* Client credential includes. */ #include "aws_clientcredential.h" @@ -51,6 +52,9 @@ /* Key provisioning includes. */ #include "aws_dev_mode_key_provisioning.h" + +/* mbedTLS includes. */ +#include "mbedtls/base64.h" /*-----------------------------------------------------------*/ /* For convenience and to enable rapid evaluation the keys are stored in const @@ -59,7 +63,7 @@ * here are externed in aws_clientcredential_keys.h for access by other * modules. */ const char clientcredentialCLIENT_CERTIFICATE_PEM[] = keyCLIENT_CERTIFICATE_PEM; -const char *clientcredentialJITR_DEVICE_CERTIFICATE_AUTHORITY_PEM = keyJITR_DEVICE_CERTIFICATE_AUTHORITY_PEM; +const char * clientcredentialJITR_DEVICE_CERTIFICATE_AUTHORITY_PEM = keyJITR_DEVICE_CERTIFICATE_AUTHORITY_PEM; const char clientcredentialCLIENT_PRIVATE_KEY_PEM[] = keyCLIENT_PRIVATE_KEY_PEM; /* @@ -81,21 +85,21 @@ const uint32_t clientcredentialCLIENT_PRIVATE_KEY_LENGTH = sizeof( clientcredent /*-----------------------------------------------------------*/ -static CK_RV prvInitialize( CK_FUNCTION_LIST_PTR * ppxFunctionList, - CK_SLOT_ID * pxSlotId, - CK_SESSION_HANDLE * pxSession ) +CK_RV xInitializePkcsSession( CK_FUNCTION_LIST_PTR * ppxFunctionList, + CK_SLOT_ID * pxSlotId, + CK_SESSION_HANDLE * pxSession ) { CK_RV xResult = 0; - CK_C_GetFunctionList pxCkGetFunctionList = NULL; - CK_ULONG ulCount = 1; + CK_C_GetFunctionList xCkGetFunctionList = NULL; + CK_ULONG xCount = 1; ( void ) ( pxSession ); /* Ensure that the PKCS#11 module is initialized. */ if( 0 == xResult ) { - pxCkGetFunctionList = C_GetFunctionList; - xResult = pxCkGetFunctionList( ppxFunctionList ); + xCkGetFunctionList = C_GetFunctionList; + xResult = xCkGetFunctionList( ppxFunctionList ); } if( 0 == xResult ) @@ -104,144 +108,298 @@ static CK_RV prvInitialize( CK_FUNCTION_LIST_PTR * ppxFunctionList, } /* Get the default private key storage ID. */ - if( 0 == xResult ) + if( ( 0 == xResult ) || ( CKR_CRYPTOKI_ALREADY_INITIALIZED == xResult ) ) { xResult = ( *ppxFunctionList )->C_GetSlotList( CK_TRUE, pxSlotId, - &ulCount ); + &xCount ); + } + + if( xResult == CKR_OK ) + { + xResult = ( *ppxFunctionList )->C_OpenSession( *pxSlotId, + CKF_SERIAL_SESSION, + NULL, + NULL, + pxSession ); } return xResult; } +/* @brief Converts PEM documents into DER formatted byte arrays. + * This is a helper function from mbedTLS util pem2der.c + * (https://github.com/ARMmbed/mbedtls/blob/development/programs/util/pem2der.c#L75) + * + * \param pucInput[in] Pointer to PEM object + * \param xLen[in] Length of PEM object + * \param pucOutput[out] Pointer to buffer where DER oboject will be placed + * \param pxOlen[in/out] Pointer to length of DER buffer. This value is updated + * to contain the actual length of the converted DER object. + * + * \return 0 if successful. Negative if conversion failed. If buffer is not + * large enough to hold converted object, pxOlen is still updated but -1 is returned. + * + */ +int convert_pem_to_der( const unsigned char * pucInput, + size_t xLen, + unsigned char * pucOutput, + size_t * pxOlen ) +{ + int lRet; + const unsigned char * pucS1; + const unsigned char * pucS2; + const unsigned char * pucEnd = pucInput + xLen; + size_t xOtherLen = 0; + pucS1 = ( unsigned char * ) strstr( ( const char * ) pucInput, "-----BEGIN" ); -/*-----------------------------------------------------------*/ + if( pucS1 == NULL ) + { + return( -1 ); + } -void vAlternateKeyProvisioning( ProvisioningParams_t * xParams ) -{ - CK_RV xResult = 0; - CK_FUNCTION_LIST_PTR pxFunctionList = NULL; - CK_SLOT_ID xSlotId = 0; - CK_SESSION_HANDLE xSession = 0; - CK_OBJECT_HANDLE xObject = 0; - CK_OBJECT_CLASS xPrivateKeyClass = CKO_PRIVATE_KEY; - CK_OBJECT_CLASS xCertificateClass = CKO_CERTIFICATE; - CK_OBJECT_CLASS xDeviceCertificateType = pkcs11CERTIFICATE_TYPE_USER; - CK_OBJECT_CLASS xRootCertificateType = pkcs11CERTIFICATE_TYPE_ROOT; - CK_KEY_TYPE xPrivateKeyType = ( CK_KEY_TYPE ) xParams->ulClientPrivateKeyType; - CK_BBOOL xCanSign = CK_TRUE; - CK_ATTRIBUTE xPrivateKeyTemplate[ provisioningPRIVATE_KEY_TEMPLATE_COUNT ]; - CK_ATTRIBUTE xCertificateTemplate[ provisioningCERTIFICATE_TEMPLATE_COUNT ]; - CK_ATTRIBUTE xRootCertificateTemplate[ provisioningROOT_CERTIFICATE_TEMPLATE_COUNT ]; + pucS2 = ( unsigned char * ) strstr( ( const char * ) pucInput, "-----END" ); - configPRINTF( ( "Starting key provisioning...\r\n" ) ); + if( pucS2 == NULL ) + { + return( -1 ); + } - /* Initialize the device private key template. */ - xPrivateKeyTemplate[ 0 ].type = CKA_CLASS; - xPrivateKeyTemplate[ 0 ].pValue = &xPrivateKeyClass; - xPrivateKeyTemplate[ 0 ].ulValueLen = sizeof( xPrivateKeyClass ); - xPrivateKeyTemplate[ 1 ].type = CKA_KEY_TYPE; - xPrivateKeyTemplate[ 1 ].pValue = &xPrivateKeyType; - xPrivateKeyTemplate[ 1 ].ulValueLen = sizeof( xPrivateKeyType ); - xPrivateKeyTemplate[ 2 ].type = CKA_SIGN; - xPrivateKeyTemplate[ 2 ].pValue = &xCanSign; - xPrivateKeyTemplate[ 2 ].ulValueLen = sizeof( xCanSign ); - xPrivateKeyTemplate[ 3 ].type = CKA_VALUE; - xPrivateKeyTemplate[ 3 ].pValue = ( CK_VOID_PTR ) xParams->pcClientPrivateKey; - xPrivateKeyTemplate[ 3 ].ulValueLen = ( CK_ULONG ) xParams->ulClientPrivateKeyLength; + pucS1 += 10; - /* Initialize the client certificate template. */ - xCertificateTemplate[ 0 ].type = CKA_CLASS; - xCertificateTemplate[ 0 ].pValue = &xCertificateClass; - xCertificateTemplate[ 0 ].ulValueLen = sizeof( xCertificateClass ); - xCertificateTemplate[ 1 ].type = CKA_VALUE; - xCertificateTemplate[ 1 ].pValue = ( CK_VOID_PTR ) xParams->pcClientCertificate; - xCertificateTemplate[ 1 ].ulValueLen = ( CK_ULONG ) xParams->ulClientCertificateLength; - xCertificateTemplate[ 2 ].type = CKA_CERTIFICATE_TYPE; - xCertificateTemplate[ 2 ].pValue = &xDeviceCertificateType; - xCertificateTemplate[ 2 ].ulValueLen = sizeof( xDeviceCertificateType ); - - /* Initialize the root certificate template. */ - xRootCertificateTemplate[ 0 ].type = CKA_CLASS; - xRootCertificateTemplate[ 0 ].pValue = &xCertificateClass; - xRootCertificateTemplate[ 0 ].ulValueLen = sizeof( xCertificateClass ); - xRootCertificateTemplate[ 1 ].type = CKA_VALUE; - xRootCertificateTemplate[ 1 ].pValue = ( CK_VOID_PTR ) tlsVERISIGN_ROOT_CERTIFICATE_PEM; - xRootCertificateTemplate[ 1 ].ulValueLen = ( CK_ULONG ) tlsVERISIGN_ROOT_CERTIFICATE_LENGTH; - xRootCertificateTemplate[ 2 ].type = CKA_CERTIFICATE_TYPE; - xRootCertificateTemplate[ 2 ].pValue = &xRootCertificateType; - xRootCertificateTemplate[ 2 ].ulValueLen = sizeof( xRootCertificateType ); - - /* Initialize the module. */ - xResult = prvInitialize( &pxFunctionList, - &xSlotId, - &xSession ); - - /* - * Check that a certificate and private key can be imported into - * persistent storage. - */ - - /* Create an object using the encoded root certificate. */ - if( 0 == xResult ) + while( pucS1 < pucEnd && *pucS1 != '-' ) { - configPRINTF( ( "Write root certificate...\r\n" ) ); + pucS1++; + } - xResult = pxFunctionList->C_CreateObject( xSession, - xRootCertificateTemplate, - sizeof( xRootCertificateTemplate ) / sizeof( CK_ATTRIBUTE ), - &xObject ); + while( pucS1 < pucEnd && *pucS1 == '-' ) + { + pucS1++; } - /* Free the certificate. */ - if( 0 == xResult ) + if( *pucS1 == '\r' ) { - xResult = pxFunctionList->C_DestroyObject( xSession, - xObject ); - xObject = 0; + pucS1++; } - /* Create an object using the encoded private key. */ - if( 0 == xResult ) + if( *pucS1 == '\n' ) { - configPRINTF( ( "Write device private key...\r\n" ) ); + pucS1++; + } - xResult = pxFunctionList->C_CreateObject( xSession, - xPrivateKeyTemplate, - sizeof( xPrivateKeyTemplate ) / sizeof( CK_ATTRIBUTE ), - &xObject ); + if( ( pucS2 <= pucS1 ) || ( pucS2 > pucEnd ) ) + { + return( -1 ); } - /* Free the private key. */ - if( 0 == xResult ) + lRet = mbedtls_base64_decode( NULL, 0, &xOtherLen, ( const unsigned char * ) pucS1, pucS2 - pucS1 ); + + if( lRet == MBEDTLS_ERR_BASE64_INVALID_CHARACTER ) { - xResult = pxFunctionList->C_DestroyObject( xSession, - xObject ); + return( lRet ); + } - xObject = 0; + if( xOtherLen > *pxOlen ) + { + return( -1 ); } - /* Create an object using the encoded client certificate. */ - if( 0 == xResult ) + if( ( lRet = mbedtls_base64_decode( pucOutput, xOtherLen, &xOtherLen, ( const unsigned char * ) pucS1, + pucS2 - pucS1 ) ) != 0 ) { - configPRINTF( ( "Write device certificate...\r\n" ) ); + return( lRet ); + } + + *pxOlen = xOtherLen; - xResult = pxFunctionList->C_CreateObject( xSession, - xCertificateTemplate, - sizeof( xCertificateTemplate ) / sizeof( CK_ATTRIBUTE ), - &xObject ); + return( 0 ); +} + +CK_RV xProvisionCertificate( CK_SESSION_HANDLE xSession, + uint8_t * pucCertificate, + size_t xCertificateLength, + uint8_t * pucLabel, + CK_OBJECT_HANDLE_PTR xObjectHandle ) +{ + PKCS11_CertificateTemplate_t xCertificateTemplate; + CK_OBJECT_CLASS xCertificateClass = CKO_CERTIFICATE; + CK_FUNCTION_LIST_PTR xFunctionList; + CK_RV xResult; + uint8_t * pucDerObject = NULL; + int32_t lConversionReturn = 0; + size_t xDerLen = 0; + + + /* Initialize the client certificate template. */ + xCertificateTemplate.xObjectClass.type = CKA_CLASS; + xCertificateTemplate.xObjectClass.pValue = &xCertificateClass; + xCertificateTemplate.xObjectClass.ulValueLen = sizeof( xCertificateClass ); + xCertificateTemplate.xValue.type = CKA_VALUE; + xCertificateTemplate.xValue.pValue = ( CK_VOID_PTR ) pucCertificate; + xCertificateTemplate.xValue.ulValueLen = ( CK_ULONG ) xCertificateLength; + xCertificateTemplate.xLabel.type = CKA_LABEL; + xCertificateTemplate.xLabel.pValue = ( CK_VOID_PTR ) pucLabel; + xCertificateTemplate.xLabel.ulValueLen = sizeof( pucLabel ); + + xResult = C_GetFunctionList( &xFunctionList ); + + if( xResult == CKR_OK ) + { + /* Convert the certificate to DER format if it was in PEM. */ + /* The DER key should be about 3/4 the size of the PEM key, so mallocing the PEM key size is sufficient. */ + pucDerObject = pvPortMalloc( xCertificateTemplate.xValue.ulValueLen ); + lConversionReturn = 0; + xDerLen = xCertificateTemplate.xValue.ulValueLen; + + if( pucDerObject != NULL ) + { + lConversionReturn = convert_pem_to_der( xCertificateTemplate.xValue.pValue, + xCertificateTemplate.xValue.ulValueLen, + pucDerObject, + &xDerLen ); + } + else + { + xResult = CKR_DEVICE_MEMORY; + } + + if( lConversionReturn == 0 ) + { + /* Set the template pointers to refer to the DER converted objects. */ + xCertificateTemplate.xValue.pValue = pucDerObject; + xCertificateTemplate.xValue.ulValueLen = xDerLen; + } + + /* Create an object using the encoded client certificate. */ + if( CKR_OK == xResult ) + { + configPRINTF( ( "Write code signing certificate...\r\n" ) ); + + xResult = xFunctionList->C_CreateObject( xSession, + ( CK_ATTRIBUTE_PTR ) &xCertificateTemplate, + sizeof( xCertificateTemplate ) / sizeof( CK_ATTRIBUTE ), + xObjectHandle ); + } + + if( pucDerObject != NULL ) + { + vPortFree( pucDerObject ); + } } - /* Free the certificate. */ - if( 0 == xResult ) + return xResult; +} + +/*-----------------------------------------------------------*/ + +CK_RV xProvisionDevice( CK_SESSION_HANDLE xSession, + ProvisioningParams_t * pxParams ) +{ + CK_RV xResult; + CK_OBJECT_CLASS xPrivateKeyClass = CKO_PRIVATE_KEY; + CK_KEY_TYPE xPrivateKeyType = ( CK_KEY_TYPE ) pxParams->ulClientPrivateKeyType; + CK_FUNCTION_LIST_PTR xFunctionList; + CK_OBJECT_HANDLE xObject = 0; + uint8_t * pucDerObject = NULL; + int32_t lConversionReturn = 0; + size_t xDerLen = 0; + + PKCS11_KeyTemplate_t xPrivateKeyTemplate; + + xResult = C_GetFunctionList( &xFunctionList ); + + /* Initialize the device private key template. */ + xPrivateKeyTemplate.xObjectClass.type = CKA_CLASS; + xPrivateKeyTemplate.xObjectClass.pValue = &xPrivateKeyClass; + xPrivateKeyTemplate.xObjectClass.ulValueLen = sizeof( xPrivateKeyClass ); + xPrivateKeyTemplate.xKeyType.type = CKA_KEY_TYPE; + xPrivateKeyTemplate.xKeyType.pValue = &xPrivateKeyType; + xPrivateKeyTemplate.xKeyType.ulValueLen = sizeof( xPrivateKeyType ); + xPrivateKeyTemplate.xValue.type = CKA_VALUE; + xPrivateKeyTemplate.xValue.pValue = ( CK_VOID_PTR ) pxParams->pcClientPrivateKey; + xPrivateKeyTemplate.xValue.ulValueLen = ( CK_ULONG ) pxParams->ulClientPrivateKeyLength; + xPrivateKeyTemplate.xLabel.type = CKA_LABEL; + xPrivateKeyTemplate.xLabel.pValue = ( CK_VOID_PTR ) pkcs11configLABEL_DEVICE_PRIVATE_KEY_FOR_TLS; + xPrivateKeyTemplate.xLabel.ulValueLen = ( CK_ULONG ) sizeof( pkcs11configLABEL_DEVICE_PRIVATE_KEY_FOR_TLS ); + + + xResult = xProvisionCertificate( xSession, + pxParams->pcClientCertificate, + pxParams->ulClientCertificateLength, + ( uint8_t * ) pkcs11configLABEL_DEVICE_CERTIFICATE_FOR_TLS, + &xObject ); + + /* Create an object using the encoded private key. */ + if( CKR_OK == xResult ) { - xResult = pxFunctionList->C_DestroyObject( xSession, - xObject ); - xObject = 0; + /* Convert the private to DER format if it was in PEM. */ + /* The DER key should be about 3/4 the size of the PEM key, so mallocing the PEM key size is sufficient. */ + pucDerObject = pvPortMalloc( xPrivateKeyTemplate.xValue.ulValueLen ); + lConversionReturn = 0; + xDerLen = xPrivateKeyTemplate.xValue.ulValueLen; + + if( pucDerObject != NULL ) + { + lConversionReturn = convert_pem_to_der( xPrivateKeyTemplate.xValue.pValue, + xPrivateKeyTemplate.xValue.ulValueLen, + pucDerObject, + &xDerLen ); + } + else + { + xResult = CKR_DEVICE_MEMORY; + } + + if( lConversionReturn == 0 ) + { + /* Set the template pointers to refer to the DER converted objects. */ + xPrivateKeyTemplate.xValue.pValue = pucDerObject; + xPrivateKeyTemplate.xValue.ulValueLen = xDerLen; + } + + if( xResult == CKR_OK ) + { + configPRINTF( ( "Write device private key...\r\n" ) ); + + xResult = xFunctionList->C_CreateObject( xSession, + ( CK_ATTRIBUTE_PTR ) &xPrivateKeyTemplate, + sizeof( xPrivateKeyTemplate ) / sizeof( CK_ATTRIBUTE ), + &xObject ); + } + + if( pucDerObject != NULL ) + { + vPortFree( pucDerObject ); + } } configPRINTF( ( "Key provisioning done...\r\n" ) ); + + + return xResult; +} + +/*-----------------------------------------------------------*/ + +void vAlternateKeyProvisioning( ProvisioningParams_t * xParams ) +{ + CK_RV xResult = CKR_OK; + CK_FUNCTION_LIST_PTR xFunctionList = NULL; + CK_SLOT_ID xSlotId = 0; + CK_SESSION_HANDLE xSession = 0; + + /* Initialize the PKCS Module */ + xResult = xInitializePkcsSession( &xFunctionList, + &xSlotId, + &xSession ); + + if( xResult == CKR_OK ) + { + xResult = xProvisionDevice( xSession, xParams ); + } + + xFunctionList->C_CloseSession( xSession ); } /*-----------------------------------------------------------*/ @@ -258,4 +416,5 @@ void vDevModeKeyProvisioning( void ) vAlternateKeyProvisioning( &xParams ); } + /*-----------------------------------------------------------*/ diff --git a/demos/common/greengrass_connectivity/aws_greengrass_discovery_demo.c b/demos/common/greengrass_connectivity/aws_greengrass_discovery_demo.c index 405145f5200..3d244b250d6 100644 --- a/demos/common/greengrass_connectivity/aws_greengrass_discovery_demo.c +++ b/demos/common/greengrass_connectivity/aws_greengrass_discovery_demo.c @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS Greengrass Demo V1.4.2 + * Amazon FreeRTOS Greengrass Demo V1.4.3 * Copyright (C) 2017 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/demos/common/include/aws_application_version.h b/demos/common/include/aws_application_version.h index 5413db2bfc3..45860fbc07a 100644 --- a/demos/common/include/aws_application_version.h +++ b/demos/common/include/aws_application_version.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2017 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/demos/common/include/aws_clientcredential.h b/demos/common/include/aws_clientcredential.h index 2c069255cbf..9cfeed208ba 100644 --- a/demos/common/include/aws_clientcredential.h +++ b/demos/common/include/aws_clientcredential.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2017 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/demos/common/include/aws_defender_demo.h b/demos/common/include/aws_defender_demo.h index e620e58b946..008c7d89c5c 100644 --- a/demos/common/include/aws_defender_demo.h +++ b/demos/common/include/aws_defender_demo.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2018 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/demos/common/include/aws_demo.h b/demos/common/include/aws_demo.h index c45cb5d5b5f..fab74119223 100644 --- a/demos/common/include/aws_demo.h +++ b/demos/common/include/aws_demo.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2017 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/demos/common/include/aws_demo_runner.h b/demos/common/include/aws_demo_runner.h index b79471569ac..0aedf00eb1d 100644 --- a/demos/common/include/aws_demo_runner.h +++ b/demos/common/include/aws_demo_runner.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2017 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/demos/common/include/aws_dev_mode_key_provisioning.h b/demos/common/include/aws_dev_mode_key_provisioning.h index c71eec60a3e..3e5df10fa04 100644 --- a/demos/common/include/aws_dev_mode_key_provisioning.h +++ b/demos/common/include/aws_dev_mode_key_provisioning.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2017 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of @@ -27,6 +27,8 @@ #ifndef _AWS_DEV_MODE_KEY_PROVISIONING_H_ #define _AWS_DEV_MODE_KEY_PROVISIONING_H_ +#include "aws_pkcs11.h" + typedef struct ProvisioningParams_t { uint32_t ulClientPrivateKeyType; @@ -40,4 +42,14 @@ void vDevModeKeyProvisioning( void ); void vAlternateKeyProvisioning( ProvisioningParams_t * xParams ); +CK_RV xInitializePkcsSession( CK_FUNCTION_LIST_PTR * ppxFunctionList, + CK_SLOT_ID * pxSlotId, + CK_SESSION_HANDLE * pxSession ); + +CK_RV xProvisionCertificate( CK_SESSION_HANDLE xSession, + uint8_t * pucCertificate, + size_t xCertificateLength, + uint8_t * pucLabel, + CK_OBJECT_HANDLE_PTR xObjectHandle ); + #endif /* _AWS_DEV_MODE_KEY_PROVISIONING_H_ */ diff --git a/demos/common/include/aws_greengrass_discovery_demo.h b/demos/common/include/aws_greengrass_discovery_demo.h index c2ba8304664..3cb6ddf265d 100644 --- a/demos/common/include/aws_greengrass_discovery_demo.h +++ b/demos/common/include/aws_greengrass_discovery_demo.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2017 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/demos/common/include/aws_hello_world.h b/demos/common/include/aws_hello_world.h index 6460cdadfe3..9b7c547ee65 100644 --- a/demos/common/include/aws_hello_world.h +++ b/demos/common/include/aws_hello_world.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2017 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/demos/common/include/aws_logging_task.h b/demos/common/include/aws_logging_task.h index 52b4fc2f234..b29a8c99058 100644 --- a/demos/common/include/aws_logging_task.h +++ b/demos/common/include/aws_logging_task.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2017 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/demos/common/include/aws_ota_update_demo.h b/demos/common/include/aws_ota_update_demo.h index d083d048c02..17521f4c7ef 100644 --- a/demos/common/include/aws_ota_update_demo.h +++ b/demos/common/include/aws_ota_update_demo.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2017 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/demos/common/include/aws_shadow_lightbulb_on_off.h b/demos/common/include/aws_shadow_lightbulb_on_off.h index 1ff9226a70f..14d8678da04 100644 --- a/demos/common/include/aws_shadow_lightbulb_on_off.h +++ b/demos/common/include/aws_shadow_lightbulb_on_off.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2017 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/demos/common/include/aws_simple_tcp_echo_server.h b/demos/common/include/aws_simple_tcp_echo_server.h index 0338bd73566..8b1bef99709 100644 --- a/demos/common/include/aws_simple_tcp_echo_server.h +++ b/demos/common/include/aws_simple_tcp_echo_server.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2017 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/demos/common/include/aws_subscribe_publish_loop.h b/demos/common/include/aws_subscribe_publish_loop.h index c417195447c..a872b68ec90 100644 --- a/demos/common/include/aws_subscribe_publish_loop.h +++ b/demos/common/include/aws_subscribe_publish_loop.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2017 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/demos/common/include/aws_tcp_echo_client_single_tasks.h b/demos/common/include/aws_tcp_echo_client_single_tasks.h index 1952168b0f9..27669fa0909 100644 --- a/demos/common/include/aws_tcp_echo_client_single_tasks.h +++ b/demos/common/include/aws_tcp_echo_client_single_tasks.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2017 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/demos/common/logging/aws_logging_task_dynamic_buffers.c b/demos/common/logging/aws_logging_task_dynamic_buffers.c index 333cb976987..584b031fec5 100644 --- a/demos/common/logging/aws_logging_task_dynamic_buffers.c +++ b/demos/common/logging/aws_logging_task_dynamic_buffers.c @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2017 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/demos/common/mqtt/aws_hello_world.c b/demos/common/mqtt/aws_hello_world.c index e628b581e4f..60b9f7dbc5f 100644 --- a/demos/common/mqtt/aws_hello_world.c +++ b/demos/common/mqtt/aws_hello_world.c @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS MQTT Echo Demo V1.4.2 + * Amazon FreeRTOS MQTT Echo Demo V1.4.3 * Copyright (C) 2017 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of @@ -82,36 +82,36 @@ * * It must be unique per MQTT broker. */ -#define echoCLIENT_ID ( ( const uint8_t * ) "MQTTEcho" ) +#define echoCLIENT_ID ( ( const uint8_t * ) "MQTTEcho" ) /** * @brief The topic that the MQTT client both subscribes and publishes to. */ -#define echoTOPIC_NAME ( ( const uint8_t * ) "freertos/demos/echo" ) +#define echoTOPIC_NAME ( ( const uint8_t * ) "freertos/demos/echo" ) /** * @brief The string appended to messages that are echoed back to the MQTT broker. * * It is also used to detect if a received message has already been acknowledged. */ -#define echoACK_STRING ( ( const char * ) " ACK" ) +#define echoACK_STRING ( ( const char * ) " ACK" ) /** * @brief The length of the ACK string appended to messages that are echoed back * to the MQTT broker. */ -#define echoACK_STRING_LENGTH 4 +#define echoACK_STRING_LENGTH 4 /** * @brief Dimension of the character array buffers used to hold data (strings in * this case) that is published to and received from the MQTT broker (in the cloud). */ -#define echoMAX_DATA_LENGTH 20 +#define echoMAX_DATA_LENGTH 20 /** * @brief A block time of 0 simply means "don't block". */ -#define echoDONT_BLOCK ( ( TickType_t ) 0 ) +#define echoDONT_BLOCK ( ( TickType_t ) 0 ) /*-----------------------------------------------------------*/ @@ -224,7 +224,7 @@ static BaseType_t prvCreateClientAndConnectToBroker( void ) { /* Could not connect, so delete the MQTT client. */ ( void ) MQTT_AGENT_Delete( xMQTTHandle ); - configPRINTF( ( "ERROR: MQTT echo failed to connect.\r\n" ) ); + configPRINTF( ( "ERROR: MQTT echo failed to connect with error %d.\r\n", xReturned ) ); } else { @@ -310,8 +310,8 @@ static void prvMessageEchoingTask( void * pvParameters ) portMAX_DELAY ); /* Ensure the ACK can be added without overflowing the buffer. - * Note that xBytesReceived already includes null character as - * it is written to the message buffer in the MQTT callback. */ + * Note that xBytesReceived already includes null character as + * it is written to the message buffer in the MQTT callback. */ if( xBytesReceived <= ( sizeof( cDataBuffer ) - ( size_t ) echoACK_STRING_LENGTH ) ) { /* Append ACK to the received message. Note that @@ -435,7 +435,8 @@ static MQTTBool_t prvMQTTCallback( void * pvUserData, static void prvMQTTConnectAndPublishTask( void * pvParameters ) { - BaseType_t x, xReturned; + BaseType_t xX; + BaseType_t xReturned; const TickType_t xFiveSeconds = pdMS_TO_TICKS( 5000UL ); const BaseType_t xIterationsInAMinute = 60 / 5; TaskHandle_t xEchoingTask = NULL; @@ -481,9 +482,9 @@ static void prvMQTTConnectAndPublishTask( void * pvParameters ) { /* MQTT client is now connected to a broker. Publish a message * every five seconds until a minute has elapsed. */ - for( x = 0; x < xIterationsInAMinute; x++ ) + for( xX = 0; xX < xIterationsInAMinute; xX++ ) { - prvPublishNextMessage( x ); + prvPublishNextMessage( xX ); /* Five seconds delay between publishes. */ vTaskDelay( xFiveSeconds ); @@ -495,7 +496,7 @@ static void prvMQTTConnectAndPublishTask( void * pvParameters ) /* End the demo by deleting all created resources. */ configPRINTF( ( "MQTT echo demo finished.\r\n" ) ); - configPRINTF( ("----Demo finished----\r\n") ); + configPRINTF( ( "----Demo finished----\r\n" ) ); vMessageBufferDelete( xEchoMessageBuffer ); vTaskDelete( xEchoingTask ); vTaskDelete( NULL ); /* Delete this task. */ diff --git a/demos/common/mqtt/aws_subscribe_publish_loop.c b/demos/common/mqtt/aws_subscribe_publish_loop.c index 8ac866a4f0e..774b5d6a1ea 100644 --- a/demos/common/mqtt/aws_subscribe_publish_loop.c +++ b/demos/common/mqtt/aws_subscribe_publish_loop.c @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2017 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of @@ -42,7 +42,7 @@ /* FreeRTOS includes. */ #include "FreeRTOS.h" #include "task.h" -#include "semphr.h" +#include "event_groups.h" /* MQTT include. */ #include "aws_mqtt_agent.h" @@ -86,14 +86,14 @@ */ typedef struct SubpubUserData { - const char * pcExpectedString; /**< Informs the MQTT callback of the next expected string. */ - uint32_t ulExpectedUint32; /**< Informs the MQTT callback of the next expected integer. */ - BaseType_t xCallbackStatus; /**< Used to communicate the success or failure of the callback function. - * xCallbackStatus is set to pdFALSE before the callback is executed, and is - * set to pdPASS inside the callback only if the callback receives the expected - * data. */ - SemaphoreHandle_t xWakeUpSemaphore; /**< Handle of semaphore to wake up the task. */ - char cTopic[ subpubTopicSize ]; /**< Topic to subscribe and publish to. */ + const char * pcExpectedString; /**< Informs the MQTT callback of the next expected string. */ + uint32_t ulExpectedUint32; /**< Informs the MQTT callback of the next expected integer. */ + BaseType_t xCallbackStatus; /**< Used to communicate the success or failure of the callback function. + * xCallbackStatus is set to pdFALSE before the callback is executed, and is + * set to pdPASS inside the callback only if the callback receives the expected + * data. */ + StaticEventGroup_t xWakeUpEventGroup; /**< Event group used to synchronize tasks. */ + char cTopic[ subpubTopicSize ]; /**< Topic to subscribe and publish to. */ } SubpubUserData_t; /** @@ -205,7 +205,7 @@ static void prvPublishSubscribeTask( void * pvParameters ); /* * Collection of strings published. */ -const char * const pcLongString = "This is a long string that requires a length encoding greater than one byte. This tests the encoding and decoding of Remaining Length field in a MQTT packet."; +static const char * const pcLongString = "This is a long string that requires a length encoding greater than one byte. This tests the encoding and decoding of Remaining Length field in a MQTT packet."; /* The maximum time to wait for an MQTT operation to complete. Needs to be * long enough for the TLS negotiation to complete. */ @@ -269,13 +269,7 @@ static MQTTBool_t prvMQTTStringPublishCallback( void * pvCallbackContext, } /* Unblock the task as the callback has executed. */ - if( xSemaphoreGive( pxUserData->xWakeUpSemaphore ) == pdFAIL ) - { - /* In case the status has been set to pass. */ - pxUserData->xCallbackStatus = pdFAIL; - } - - configASSERT( pxUserData->xCallbackStatus == pdPASS ); + ( void ) xEventGroupSetBits( &( pxUserData->xWakeUpEventGroup ), 1 ); /* We do not want to take the ownership of buffer. */ return xTakeOwnership; @@ -312,13 +306,7 @@ static MQTTBool_t prvMQTTUint32PublishCallback( void * pvCallbackContext, } /* Unblock the task as the callback has executed. */ - if( xSemaphoreGive( pxUserData->xWakeUpSemaphore ) == pdFAIL ) - { - /* In case the status has been set to pass. */ - pxUserData->xCallbackStatus = pdFAIL; - } - - configASSERT( pxUserData->xCallbackStatus == pdPASS ); + ( void ) xEventGroupSetBits( &( pxUserData->xWakeUpEventGroup ), 1 ); /* We do not want to take the ownership of buffer. */ return xTakeOwnership; @@ -382,12 +370,14 @@ static BaseType_t prvUint32PublishSubscribe( MQTTAgentConnectParams_t * pxConnec if( MQTT_AGENT_Publish( xMQTTClientHandle, &xPublishParams, xMaxCommandTime ) == eMQTTAgentSuccess ) { - configPRINTF( ( "%s published to topic %s\r\n", __FUNCTION__, xPublishParams.pucTopic ) ); - - /* The event callback will give this semaphore when it - * executes, until then wait here. At this time this demo does not have - * more than one message outstanding at a time. */ - if( xSemaphoreTake( pxUserData->xWakeUpSemaphore, xMaxCommandTime ) == pdPASS ) + /* The event callback will set bit 0 in this event group when it executes, + * until then wait here. At this time this demo does not have more than one + * message outstanding at a time. */ + if( xEventGroupWaitBits( &( pxUserData->xWakeUpEventGroup ), + 1, + pdTRUE, + pdTRUE, + xMaxCommandTime ) == 1 ) { /* Did the callback execute and pass? If so the callback * will have set xCallbackStatus to pdPASS. */ @@ -512,9 +502,13 @@ static BaseType_t prvStringPublishSubscribe( MQTTAgentConnectParams_t * pxConnec xResult = pdFAIL; } - /* The event callback will give this semaphore when it executes, + /* The event callback will set bit 0 in this event group when it executes, * until then wait here. */ - if( xSemaphoreTake( pxUserData->xWakeUpSemaphore, xMaxCommandTime ) == pdFALSE ) + if( xEventGroupWaitBits( &( pxUserData->xWakeUpEventGroup ), + 1, + pdTRUE, + pdTRUE, + xMaxCommandTime ) != 1 ) { xResult = pdFAIL; } @@ -543,9 +537,13 @@ static BaseType_t prvStringPublishSubscribe( MQTTAgentConnectParams_t * pxConnec xResult = pdFAIL; } - /* The event callback will give this semaphore when it executes, + /* The event callback will set bit 0 in this event group when it executes, * until then wait here. */ - if( xSemaphoreTake( pxUserData->xWakeUpSemaphore, xMaxCommandTime ) == pdFALSE ) + if( xEventGroupWaitBits( &( pxUserData->xWakeUpEventGroup ), + 1, + pdTRUE, + pdTRUE, + xMaxCommandTime ) != 1 ) { xResult = pdFAIL; } @@ -599,11 +597,11 @@ static void prvSubscribePublishDemo( MQTTAgentHandle_t xMQTTClientHandle, BaseType_t xResult; MQTTAgentConnectParams_t xConnectParams; TaskStatus_t xTaskStatus; - SemaphoreHandle_t xCallbackSemaphore = NULL; SubpubUserData_t xUserData; - xCallbackSemaphore = xSemaphoreCreateBinary(); - xUserData.xWakeUpSemaphore = xCallbackSemaphore; + /* Create the event group used to synchronize tasks and callback functions. + * This function will not fail when its argument isn't NULL. */ + ( void ) xEventGroupCreateStatic( &( xUserData.xWakeUpEventGroup ) ); /* Each function below connects then disconnects from the broker. To save * each from having to setup the connect parameters the parameters are set up diff --git a/demos/common/ota/aws_ota_update_demo.c b/demos/common/ota/aws_ota_update_demo.c index 7570b730417..989fa265e3d 100644 --- a/demos/common/ota/aws_ota_update_demo.c +++ b/demos/common/ota/aws_ota_update_demo.c @@ -1,5 +1,5 @@ /* -Amazon FreeRTOS OTA Update Demo V1.4.2 +Amazon FreeRTOS OTA Update Demo V1.4.3 Copyright (C) 2017 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/demos/common/ota/bootloader/crypto/tinycrypt/asn1utility.c b/demos/common/ota/bootloader/crypto/tinycrypt/asn1utility.c index 1126ed613ee..a420c19c20b 100644 --- a/demos/common/ota/bootloader/crypto/tinycrypt/asn1utility.c +++ b/demos/common/ota/bootloader/crypto/tinycrypt/asn1utility.c @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS Demo Bootloader V1.4.2 + * Amazon FreeRTOS Demo Bootloader V1.4.3 * Copyright (C) 2018 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/demos/common/ota/bootloader/crypto/tinycrypt/asn1utility.h b/demos/common/ota/bootloader/crypto/tinycrypt/asn1utility.h index 3c36d7b20d7..25b708db5b7 100644 --- a/demos/common/ota/bootloader/crypto/tinycrypt/asn1utility.h +++ b/demos/common/ota/bootloader/crypto/tinycrypt/asn1utility.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS Demo Bootloader V1.4.2 + * Amazon FreeRTOS Demo Bootloader V1.4.3 * Copyright (C) 2018 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/demos/common/ota/bootloader/crypto/tinycrypt/aws_boot_crypto.c b/demos/common/ota/bootloader/crypto/tinycrypt/aws_boot_crypto.c index 12fbb66cfb6..123127d81b2 100644 --- a/demos/common/ota/bootloader/crypto/tinycrypt/aws_boot_crypto.c +++ b/demos/common/ota/bootloader/crypto/tinycrypt/aws_boot_crypto.c @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS Demo Bootloader V1.4.2 + * Amazon FreeRTOS Demo Bootloader V1.4.3 * Copyright (C) 2018 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/demos/common/ota/bootloader/flash/portable/microchip/curiosity_pic32mzef/aws_boot_flash.c b/demos/common/ota/bootloader/flash/portable/microchip/curiosity_pic32mzef/aws_boot_flash.c index 57eb4be0c9c..305440cfa16 100644 --- a/demos/common/ota/bootloader/flash/portable/microchip/curiosity_pic32mzef/aws_boot_flash.c +++ b/demos/common/ota/bootloader/flash/portable/microchip/curiosity_pic32mzef/aws_boot_flash.c @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS Demo Bootloader V1.4.2 + * Amazon FreeRTOS Demo Bootloader V1.4.3 * Copyright (C) 2018 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/demos/common/ota/bootloader/flash/portable/microchip/curiosity_pic32mzef/aws_boot_flash_info.h b/demos/common/ota/bootloader/flash/portable/microchip/curiosity_pic32mzef/aws_boot_flash_info.h index 32dcc8f54df..1fdd6537ccc 100644 --- a/demos/common/ota/bootloader/flash/portable/microchip/curiosity_pic32mzef/aws_boot_flash_info.h +++ b/demos/common/ota/bootloader/flash/portable/microchip/curiosity_pic32mzef/aws_boot_flash_info.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS Demo Bootloader V1.4.2 + * Amazon FreeRTOS Demo Bootloader V1.4.3 * Copyright (C) 2018 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/demos/common/ota/bootloader/flash/portable/microchip/curiosity_pic32mzef/aws_boot_nvm.c b/demos/common/ota/bootloader/flash/portable/microchip/curiosity_pic32mzef/aws_boot_nvm.c index 7e3114c225f..c1f6ac70e8d 100644 --- a/demos/common/ota/bootloader/flash/portable/microchip/curiosity_pic32mzef/aws_boot_nvm.c +++ b/demos/common/ota/bootloader/flash/portable/microchip/curiosity_pic32mzef/aws_boot_nvm.c @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS Demo Bootloader V1.4.2 + * Amazon FreeRTOS Demo Bootloader V1.4.3 * Copyright (C) 2018 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/demos/common/ota/bootloader/flash/portable/microchip/curiosity_pic32mzef/aws_boot_nvm.h b/demos/common/ota/bootloader/flash/portable/microchip/curiosity_pic32mzef/aws_boot_nvm.h index d2a3460891f..729116afd42 100644 --- a/demos/common/ota/bootloader/flash/portable/microchip/curiosity_pic32mzef/aws_boot_nvm.h +++ b/demos/common/ota/bootloader/flash/portable/microchip/curiosity_pic32mzef/aws_boot_nvm.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS Demo Bootloader V1.4.2 + * Amazon FreeRTOS Demo Bootloader V1.4.3 * Copyright (C) 2018 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/demos/common/ota/bootloader/flash/portable/microchip/curiosity_pic32mzef/aws_boot_partition.c b/demos/common/ota/bootloader/flash/portable/microchip/curiosity_pic32mzef/aws_boot_partition.c index 2bea3c65287..c337348ea7b 100644 --- a/demos/common/ota/bootloader/flash/portable/microchip/curiosity_pic32mzef/aws_boot_partition.c +++ b/demos/common/ota/bootloader/flash/portable/microchip/curiosity_pic32mzef/aws_boot_partition.c @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS Demo Bootloader V1.4.2 + * Amazon FreeRTOS Demo Bootloader V1.4.3 * Copyright (C) 2018 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/demos/common/ota/bootloader/flash/portable/microchip/curiosity_pic32mzef/aws_boot_partition.h b/demos/common/ota/bootloader/flash/portable/microchip/curiosity_pic32mzef/aws_boot_partition.h index 5f96ab1b35b..48f1a494d3e 100644 --- a/demos/common/ota/bootloader/flash/portable/microchip/curiosity_pic32mzef/aws_boot_partition.h +++ b/demos/common/ota/bootloader/flash/portable/microchip/curiosity_pic32mzef/aws_boot_partition.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS Demo Bootloader V1.4.2 + * Amazon FreeRTOS Demo Bootloader V1.4.3 * Copyright (C) 2018 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/demos/common/ota/bootloader/include/aws_boot_crypto.h b/demos/common/ota/bootloader/include/aws_boot_crypto.h index a8d7c74bf62..d07b0493820 100644 --- a/demos/common/ota/bootloader/include/aws_boot_crypto.h +++ b/demos/common/ota/bootloader/include/aws_boot_crypto.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS Demo Bootloader V1.4.2 + * Amazon FreeRTOS Demo Bootloader V1.4.3 * Copyright (C) 2018 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/demos/common/ota/bootloader/include/aws_boot_flash.h b/demos/common/ota/bootloader/include/aws_boot_flash.h index f1293e03500..ae194ee70fa 100644 --- a/demos/common/ota/bootloader/include/aws_boot_flash.h +++ b/demos/common/ota/bootloader/include/aws_boot_flash.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS Demo Bootloader V1.4.2 + * Amazon FreeRTOS Demo Bootloader V1.4.3 * Copyright (C) 2018 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/demos/common/ota/bootloader/include/aws_boot_loader.h b/demos/common/ota/bootloader/include/aws_boot_loader.h index 84e6def1d12..2d9c78db924 100644 --- a/demos/common/ota/bootloader/include/aws_boot_loader.h +++ b/demos/common/ota/bootloader/include/aws_boot_loader.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS Demo Bootloader V1.4.2 + * Amazon FreeRTOS Demo Bootloader V1.4.3 * Copyright (C) 2018 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/demos/common/ota/bootloader/include/aws_boot_log.h b/demos/common/ota/bootloader/include/aws_boot_log.h index 6e302276aeb..2f845c58e1d 100644 --- a/demos/common/ota/bootloader/include/aws_boot_log.h +++ b/demos/common/ota/bootloader/include/aws_boot_log.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS Demo Bootloader V1.4.2 + * Amazon FreeRTOS Demo Bootloader V1.4.3 * Copyright (C) 2018 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/demos/common/ota/bootloader/include/aws_boot_pal.h b/demos/common/ota/bootloader/include/aws_boot_pal.h index 014042add49..e315c3c2eef 100644 --- a/demos/common/ota/bootloader/include/aws_boot_pal.h +++ b/demos/common/ota/bootloader/include/aws_boot_pal.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS Demo Bootloader V1.4.2 + * Amazon FreeRTOS Demo Bootloader V1.4.3 * Copyright (C) 2018 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/demos/common/ota/bootloader/include/aws_boot_partition.h b/demos/common/ota/bootloader/include/aws_boot_partition.h index d82b0c04832..051c164f99f 100644 --- a/demos/common/ota/bootloader/include/aws_boot_partition.h +++ b/demos/common/ota/bootloader/include/aws_boot_partition.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS Demo Bootloader V1.4.2 + * Amazon FreeRTOS Demo Bootloader V1.4.3 * Copyright (C) 2018 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/demos/common/ota/bootloader/include/aws_boot_types.h b/demos/common/ota/bootloader/include/aws_boot_types.h index 4eccee34356..a534918461e 100644 --- a/demos/common/ota/bootloader/include/aws_boot_types.h +++ b/demos/common/ota/bootloader/include/aws_boot_types.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS Demo Bootloader V1.4.2 + * Amazon FreeRTOS Demo Bootloader V1.4.3 * Copyright (C) 2018 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/demos/common/ota/bootloader/loader/aws_boot_loader.c b/demos/common/ota/bootloader/loader/aws_boot_loader.c index 6315904479f..d76480d2bf4 100644 --- a/demos/common/ota/bootloader/loader/aws_boot_loader.c +++ b/demos/common/ota/bootloader/loader/aws_boot_loader.c @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS Demo Bootloader V1.4.2 + * Amazon FreeRTOS Demo Bootloader V1.4.3 * Copyright (C) 2018 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/demos/common/ota/bootloader/loader/portable/microchip/curiosity_pic32mzef/aws_boot_pal.c b/demos/common/ota/bootloader/loader/portable/microchip/curiosity_pic32mzef/aws_boot_pal.c index 2b7c551c4f5..339c3e92108 100644 --- a/demos/common/ota/bootloader/loader/portable/microchip/curiosity_pic32mzef/aws_boot_pal.c +++ b/demos/common/ota/bootloader/loader/portable/microchip/curiosity_pic32mzef/aws_boot_pal.c @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS Demo Bootloader V1.4.2 + * Amazon FreeRTOS Demo Bootloader V1.4.3 * Copyright (C) 2018 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/demos/common/ota/bootloader/logging/aws_boot_log.c b/demos/common/ota/bootloader/logging/aws_boot_log.c index d3da576fbc8..3dd11aa69ad 100644 --- a/demos/common/ota/bootloader/logging/aws_boot_log.c +++ b/demos/common/ota/bootloader/logging/aws_boot_log.c @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS Demo Bootloader V1.4.2 + * Amazon FreeRTOS Demo Bootloader V1.4.3 * Copyright (C) 2018 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/demos/common/ota/bootloader/logging/portable/microchip/curiosity_pic32mzef/aws_boot_log_uart.c b/demos/common/ota/bootloader/logging/portable/microchip/curiosity_pic32mzef/aws_boot_log_uart.c index b2434180684..cd43acf213d 100644 --- a/demos/common/ota/bootloader/logging/portable/microchip/curiosity_pic32mzef/aws_boot_log_uart.c +++ b/demos/common/ota/bootloader/logging/portable/microchip/curiosity_pic32mzef/aws_boot_log_uart.c @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS Demo Bootloader V1.4.2 + * Amazon FreeRTOS Demo Bootloader V1.4.3 * Copyright (C) 2018 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/demos/common/shadow/aws_shadow_lightbulb_on_off.c b/demos/common/shadow/aws_shadow_lightbulb_on_off.c index 3afd4b2c867..0ffbb9393e5 100644 --- a/demos/common/shadow/aws_shadow_lightbulb_on_off.c +++ b/demos/common/shadow/aws_shadow_lightbulb_on_off.c @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS Shadow Demo V1.4.2 + * Amazon FreeRTOS Shadow Demo V1.4.3 * Copyright (C) 2017 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/demos/common/tcp/aws_simple_tcp_echo_server.c b/demos/common/tcp/aws_simple_tcp_echo_server.c index 68aae6c100c..49f1296dde9 100644 --- a/demos/common/tcp/aws_simple_tcp_echo_server.c +++ b/demos/common/tcp/aws_simple_tcp_echo_server.c @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2017 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/demos/common/tcp/aws_tcp_echo_client_separate_tasks.c b/demos/common/tcp/aws_tcp_echo_client_separate_tasks.c index 36e54ff97df..cbb1cae5336 100644 --- a/demos/common/tcp/aws_tcp_echo_client_separate_tasks.c +++ b/demos/common/tcp/aws_tcp_echo_client_separate_tasks.c @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2017 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/demos/common/tcp/aws_tcp_echo_client_single_task.c b/demos/common/tcp/aws_tcp_echo_client_single_task.c index 353f9d29a93..c8eceb4435f 100644 --- a/demos/common/tcp/aws_tcp_echo_client_single_task.c +++ b/demos/common/tcp/aws_tcp_echo_client_single_task.c @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2017 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/demos/espressif/esp32_devkitc_esp_wrover_kit/common/application_code/espressif_code/mbedtls/port/include/mbedtls/esp_config.h b/demos/espressif/esp32_devkitc_esp_wrover_kit/common/application_code/espressif_code/mbedtls/port/include/mbedtls/esp_config.h index df2c6f0b3a3..64368be9cb4 100644 --- a/demos/espressif/esp32_devkitc_esp_wrover_kit/common/application_code/espressif_code/mbedtls/port/include/mbedtls/esp_config.h +++ b/demos/espressif/esp32_devkitc_esp_wrover_kit/common/application_code/espressif_code/mbedtls/port/include/mbedtls/esp_config.h @@ -1337,7 +1337,7 @@ * * Uncomment this to allow your own alternate threading implementation. */ -//#define MBEDTLS_THREADING_ALT +#define MBEDTLS_THREADING_ALT /** * \def MBEDTLS_THREADING_PTHREAD @@ -2397,7 +2397,7 @@ * * Enable this layer to allow use of mutexes within mbed TLS */ -//#define MBEDTLS_THREADING_C +#define MBEDTLS_THREADING_C /** * \def MBEDTLS_TIMING_C diff --git a/demos/espressif/esp32_devkitc_esp_wrover_kit/common/application_code/main.c b/demos/espressif/esp32_devkitc_esp_wrover_kit/common/application_code/main.c index 8571cff22bd..5d77f3c266a 100644 --- a/demos/espressif/esp32_devkitc_esp_wrover_kit/common/application_code/main.c +++ b/demos/espressif/esp32_devkitc_esp_wrover_kit/common/application_code/main.c @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of @@ -29,6 +29,7 @@ /* Demo includes */ #include "aws_demo_runner.h" +#include "aws_dev_mode_key_provisioning.h" /* AWS System includes. */ #include "aws_system_init.h" @@ -150,6 +151,12 @@ int app_main( void ) { /* Connect to the wifi before running the demos */ prvWifiConnect(); + + /* A simple example to demonstrate key and certificate provisioning in + * microcontroller flash using PKCS#11 interface. This should be replaced + * by production ready key provisioning mechanism. */ + vDevModeKeyProvisioning(); + /* Run all demos. */ DEMO_RUNNER_RunDemos(); } @@ -394,4 +401,4 @@ void vApplicationIPNetworkEventHook( eIPCallbackEvent_t eNetworkEvent ) evt.event_info.got_ip.ip_info.gw.addr = ulGatewayAddress; esp_event_send(&evt); } -} +} \ No newline at end of file diff --git a/demos/espressif/esp32_devkitc_esp_wrover_kit/common/config_files/aws_bufferpool_config.h b/demos/espressif/esp32_devkitc_esp_wrover_kit/common/config_files/aws_bufferpool_config.h index 3def43f0be6..c56e7d2faf5 100644 --- a/demos/espressif/esp32_devkitc_esp_wrover_kit/common/config_files/aws_bufferpool_config.h +++ b/demos/espressif/esp32_devkitc_esp_wrover_kit/common/config_files/aws_bufferpool_config.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2018 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/demos/espressif/esp32_devkitc_esp_wrover_kit/common/config_files/aws_demo_config.h b/demos/espressif/esp32_devkitc_esp_wrover_kit/common/config_files/aws_demo_config.h index 2d6ccd3086f..c751141e91f 100644 --- a/demos/espressif/esp32_devkitc_esp_wrover_kit/common/config_files/aws_demo_config.h +++ b/demos/espressif/esp32_devkitc_esp_wrover_kit/common/config_files/aws_demo_config.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2018 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/demos/espressif/esp32_devkitc_esp_wrover_kit/common/config_files/aws_ggd_config.h b/demos/espressif/esp32_devkitc_esp_wrover_kit/common/config_files/aws_ggd_config.h index 8af53e17690..db2c1fcc44d 100644 --- a/demos/espressif/esp32_devkitc_esp_wrover_kit/common/config_files/aws_ggd_config.h +++ b/demos/espressif/esp32_devkitc_esp_wrover_kit/common/config_files/aws_ggd_config.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2018 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/demos/espressif/esp32_devkitc_esp_wrover_kit/common/config_files/aws_mqtt_agent_config.h b/demos/espressif/esp32_devkitc_esp_wrover_kit/common/config_files/aws_mqtt_agent_config.h index 7b04d4b4c85..39057613d66 100644 --- a/demos/espressif/esp32_devkitc_esp_wrover_kit/common/config_files/aws_mqtt_agent_config.h +++ b/demos/espressif/esp32_devkitc_esp_wrover_kit/common/config_files/aws_mqtt_agent_config.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2018 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/demos/espressif/esp32_devkitc_esp_wrover_kit/common/config_files/aws_mqtt_config.h b/demos/espressif/esp32_devkitc_esp_wrover_kit/common/config_files/aws_mqtt_config.h index 1fabee0a5c7..f354ab6f572 100644 --- a/demos/espressif/esp32_devkitc_esp_wrover_kit/common/config_files/aws_mqtt_config.h +++ b/demos/espressif/esp32_devkitc_esp_wrover_kit/common/config_files/aws_mqtt_config.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2018 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/demos/espressif/esp32_devkitc_esp_wrover_kit/common/config_files/aws_ota_agent_config.h b/demos/espressif/esp32_devkitc_esp_wrover_kit/common/config_files/aws_ota_agent_config.h index dd41759bee4..8638edbaa71 100644 --- a/demos/espressif/esp32_devkitc_esp_wrover_kit/common/config_files/aws_ota_agent_config.h +++ b/demos/espressif/esp32_devkitc_esp_wrover_kit/common/config_files/aws_ota_agent_config.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2018 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/demos/espressif/esp32_devkitc_esp_wrover_kit/common/config_files/aws_pkcs11_config.h b/demos/espressif/esp32_devkitc_esp_wrover_kit/common/config_files/aws_pkcs11_config.h index eba5a852d69..dcf5b1650cf 100644 --- a/demos/espressif/esp32_devkitc_esp_wrover_kit/common/config_files/aws_pkcs11_config.h +++ b/demos/espressif/esp32_devkitc_esp_wrover_kit/common/config_files/aws_pkcs11_config.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of @@ -32,12 +32,6 @@ #ifndef _AWS_PKCS11_CONFIG_H_ #define _AWS_PKCS11_CONFIG_H_ -/** - * @brief File storage location definitions. - */ -#define pkcs11configFILE_NAME_CLIENT_CERTIFICATE "ESP_P11_Cert" -#define pkcs11configFILE_NAME_KEY "ESP_P11_Key" - /* A non-standard version of C_INITIALIZE should be used by this port. */ /* #define pkcs11configC_INITIALIZE_ALT */ diff --git a/demos/espressif/esp32_devkitc_esp_wrover_kit/common/config_files/aws_secure_sockets_config.h b/demos/espressif/esp32_devkitc_esp_wrover_kit/common/config_files/aws_secure_sockets_config.h index e0fce0fba9d..bcdd21d55a2 100644 --- a/demos/espressif/esp32_devkitc_esp_wrover_kit/common/config_files/aws_secure_sockets_config.h +++ b/demos/espressif/esp32_devkitc_esp_wrover_kit/common/config_files/aws_secure_sockets_config.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2018 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/demos/espressif/esp32_devkitc_esp_wrover_kit/common/config_files/aws_shadow_config.h b/demos/espressif/esp32_devkitc_esp_wrover_kit/common/config_files/aws_shadow_config.h index 9024956acbe..80856c2d781 100644 --- a/demos/espressif/esp32_devkitc_esp_wrover_kit/common/config_files/aws_shadow_config.h +++ b/demos/espressif/esp32_devkitc_esp_wrover_kit/common/config_files/aws_shadow_config.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2018 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/demos/espressif/esp32_devkitc_esp_wrover_kit/common/config_files/aws_wifi_config.h b/demos/espressif/esp32_devkitc_esp_wrover_kit/common/config_files/aws_wifi_config.h index ee43172b320..3af78029cf0 100644 --- a/demos/espressif/esp32_devkitc_esp_wrover_kit/common/config_files/aws_wifi_config.h +++ b/demos/espressif/esp32_devkitc_esp_wrover_kit/common/config_files/aws_wifi_config.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2018 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/demos/infineon/xmc4800_iotkit/common/application_code/main.c b/demos/infineon/xmc4800_iotkit/common/application_code/main.c index 28b02fc37d8..1a492306f59 100644 --- a/demos/infineon/xmc4800_iotkit/common/application_code/main.c +++ b/demos/infineon/xmc4800_iotkit/common/application_code/main.c @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2018 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/demos/infineon/xmc4800_iotkit/common/config_files/FreeRTOSConfig.h b/demos/infineon/xmc4800_iotkit/common/config_files/FreeRTOSConfig.h index b1bd67beab3..a1f9130ab98 100644 --- a/demos/infineon/xmc4800_iotkit/common/config_files/FreeRTOSConfig.h +++ b/demos/infineon/xmc4800_iotkit/common/config_files/FreeRTOSConfig.h @@ -78,7 +78,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define configUSE_TIMERS 1 #define configTIMER_TASK_PRIORITY ( configMAX_PRIORITIES - 1 ) #define configTIMER_QUEUE_LENGTH 5 -#define configTIMER_TASK_STACK_DEPTH ( configMINIMAL_STACK_SIZE * 2 ) +#define configTIMER_TASK_STACK_DEPTH ( configMINIMAL_STACK_SIZE * 6 ) /* Event group related definitions. */ #define configUSE_EVENT_GROUPS 1 diff --git a/demos/infineon/xmc4800_iotkit/common/config_files/aws_bufferpool_config.h b/demos/infineon/xmc4800_iotkit/common/config_files/aws_bufferpool_config.h index b41c3d9acd8..95c559b267a 100644 --- a/demos/infineon/xmc4800_iotkit/common/config_files/aws_bufferpool_config.h +++ b/demos/infineon/xmc4800_iotkit/common/config_files/aws_bufferpool_config.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2018 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/demos/infineon/xmc4800_iotkit/common/config_files/aws_demo_config.h b/demos/infineon/xmc4800_iotkit/common/config_files/aws_demo_config.h index 94e9ab7ab67..283dbc6db3d 100644 --- a/demos/infineon/xmc4800_iotkit/common/config_files/aws_demo_config.h +++ b/demos/infineon/xmc4800_iotkit/common/config_files/aws_demo_config.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2018 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/demos/infineon/xmc4800_iotkit/common/config_files/aws_ggd_config.h b/demos/infineon/xmc4800_iotkit/common/config_files/aws_ggd_config.h index a2fbd1bbaf8..db2c1fcc44d 100644 --- a/demos/infineon/xmc4800_iotkit/common/config_files/aws_ggd_config.h +++ b/demos/infineon/xmc4800_iotkit/common/config_files/aws_ggd_config.h @@ -1,6 +1,6 @@ /* - * Amazon FreeRTOS V1.4.2 - * Copyright (C) 2017 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Amazon FreeRTOS V1.4.3 + * Copyright (C) 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in diff --git a/demos/infineon/xmc4800_iotkit/common/config_files/aws_mqtt_agent_config.h b/demos/infineon/xmc4800_iotkit/common/config_files/aws_mqtt_agent_config.h index b50297b62a8..e3bcb4faafc 100644 --- a/demos/infineon/xmc4800_iotkit/common/config_files/aws_mqtt_agent_config.h +++ b/demos/infineon/xmc4800_iotkit/common/config_files/aws_mqtt_agent_config.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of @@ -43,18 +43,6 @@ */ #define mqttconfigENABLE_METRICS ( 1 ) -/** - * @defgroup Metrics The metrics reported to the AWS IoT broker. - * - * If mqttconfigENABLE_METRICS is set to 1, these will be included - * in the "username" field of MQTT connect messages. - */ -/** @{ */ -#define mqttconfigMETRIC_SDK "SDK=AmazonFreeRTOS" /**< The SDK used by this device. */ -#define mqttconfigMETRIC_VERSION "Version="tskKERNEL_VERSION_NUMBER /**< The version number of this SDK. */ -#define mqttconfigMETRIC_PLATFORM "Platform=XMC4800_IOTKIT" /**< *FIX ME: Replace 'Unkown' with your platform name.* The platform that this SDK is running on. */ -/** @} */ - /** * @brief The maximum time interval in seconds allowed to elapse between 2 consecutive * control packets. diff --git a/demos/infineon/xmc4800_iotkit/common/config_files/aws_mqtt_config.h b/demos/infineon/xmc4800_iotkit/common/config_files/aws_mqtt_config.h index 84ef1d7d692..15e3bb0a08a 100644 --- a/demos/infineon/xmc4800_iotkit/common/config_files/aws_mqtt_config.h +++ b/demos/infineon/xmc4800_iotkit/common/config_files/aws_mqtt_config.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2018 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/demos/infineon/xmc4800_iotkit/common/config_files/aws_ota_agent_config.h b/demos/infineon/xmc4800_iotkit/common/config_files/aws_ota_agent_config.h index 3abfb8a2da4..67f629f1f9c 100644 --- a/demos/infineon/xmc4800_iotkit/common/config_files/aws_ota_agent_config.h +++ b/demos/infineon/xmc4800_iotkit/common/config_files/aws_ota_agent_config.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2018 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/demos/infineon/xmc4800_iotkit/common/config_files/aws_pkcs11_config.h b/demos/infineon/xmc4800_iotkit/common/config_files/aws_pkcs11_config.h index 8c2bc8a61ce..d9e6814abee 100644 --- a/demos/infineon/xmc4800_iotkit/common/config_files/aws_pkcs11_config.h +++ b/demos/infineon/xmc4800_iotkit/common/config_files/aws_pkcs11_config.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2018 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/demos/infineon/xmc4800_iotkit/common/config_files/aws_secure_sockets_config.h b/demos/infineon/xmc4800_iotkit/common/config_files/aws_secure_sockets_config.h index e0fce0fba9d..bcdd21d55a2 100644 --- a/demos/infineon/xmc4800_iotkit/common/config_files/aws_secure_sockets_config.h +++ b/demos/infineon/xmc4800_iotkit/common/config_files/aws_secure_sockets_config.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2018 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/demos/infineon/xmc4800_iotkit/common/config_files/aws_shadow_config.h b/demos/infineon/xmc4800_iotkit/common/config_files/aws_shadow_config.h index 276cef25fa1..4de6043d121 100644 --- a/demos/infineon/xmc4800_iotkit/common/config_files/aws_shadow_config.h +++ b/demos/infineon/xmc4800_iotkit/common/config_files/aws_shadow_config.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2018 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/demos/infineon/xmc4800_iotkit/common/config_files/aws_wifi_config.h b/demos/infineon/xmc4800_iotkit/common/config_files/aws_wifi_config.h index 8699704e5b3..36209f0845c 100644 --- a/demos/infineon/xmc4800_iotkit/common/config_files/aws_wifi_config.h +++ b/demos/infineon/xmc4800_iotkit/common/config_files/aws_wifi_config.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2018 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/demos/infineon/xmc4800_iotkit/common/config_files/trcConfig.h b/demos/infineon/xmc4800_iotkit/common/config_files/trcConfig.h deleted file mode 100644 index 7cea00d3ea2..00000000000 --- a/demos/infineon/xmc4800_iotkit/common/config_files/trcConfig.h +++ /dev/null @@ -1,159 +0,0 @@ -/******************************************************************************* - * Trace Recorder Library for Tracealyzer v3.1.2 - * Percepio AB, www.percepio.com - * - * trcConfig.h - * - * Main configuration parameters for the trace recorder library. - * More settings can be found in trcStreamingConfig.h and trcSnapshotConfig.h. - * - * Read more at http://percepio.com/2016/10/05/rtos-tracing/ - * - * Terms of Use - * This file is part of the trace recorder library (RECORDER), which is the - * intellectual property of Percepio AB (PERCEPIO) and provided under a - * license as follows. - * The RECORDER may be used free of charge for the purpose of recording data - * intended for analysis in PERCEPIO products. It may not be used or modified - * for other purposes without explicit permission from PERCEPIO. - * You may distribute the RECORDER in its original source code form, assuming - * this text (terms of use, disclaimer, copyright notice) is unchanged. You are - * allowed to distribute the RECORDER with minor modifications intended for - * configuration or porting of the RECORDER, e.g., to allow using it on a - * specific processor, processor family or with a specific communication - * interface. Any such modifications should be documented directly below - * this comment block. - * - * Disclaimer - * The RECORDER is being delivered to you AS IS and PERCEPIO makes no warranty - * as to its use or performance. PERCEPIO does not and cannot warrant the - * performance or results you may obtain by using the RECORDER or documentation. - * PERCEPIO make no warranties, express or implied, as to noninfringement of - * third party rights, merchantability, or fitness for any particular purpose. - * In no event will PERCEPIO, its technology partners, or distributors be liable - * to you for any consequential, incidental or special damages, including any - * lost profits or lost savings, even if a representative of PERCEPIO has been - * advised of the possibility of such damages, or for any claim by any third - * party. Some jurisdictions do not allow the exclusion or limitation of - * incidental, consequential or special damages, or the exclusion of implied - * warranties or limitations on how long an implied warranty may last, so the - * above limitations may not apply to you. - * - * Tabs are used for indent in this file (1 tab = 4 spaces) - * - * Copyright Percepio AB, 2016. - * www.percepio.com - ******************************************************************************/ - -#ifndef TRC_CONFIG_H -#define TRC_CONFIG_H - -#ifdef __cplusplus -extern "C" { -#endif - -#include "trcPortDefines.h" - -/****************************************************************************** - * Include of processor header file - * - * Here you may need to include the header file for your processor. This is - * required at least for the ARM Cortex-M port, that uses the ARM CMSIS API. - * Try that in case of build problems. Otherwise, remove the #error line below. - *****************************************************************************/ -//#error "Trace Recorder: Please include your processor's header file here and remove this line." - -/******************************************************************************* - * Configuration Macro: TRC_CFG_HARDWARE_PORT - * - * Specify what hardware port to use (i.e., the "timestamping driver"). - * - * All ARM Cortex-M MCUs are supported by "TRC_HARDWARE_PORT_ARM_Cortex_M". - * This port uses the DWT cycle counter for Cortex-M3/M4/M7 devices, which is - * available on most such devices. In case your device don't have DWT support, - * you will get an error message opening the trace. In that case, you may - * force the recorder to use SysTick timestamping instead, using this define: - * - * #define TRC_CFG_ARM_CM_USE_SYSTICK - * - * For ARM Cortex-M0/M0+ devices, SysTick mode is used automatically. - * - * See trcHardwarePort.h for available ports and information on how to - * define your own port, if not already present. - ******************************************************************************/ -#define TRC_CFG_HARDWARE_PORT TRC_HARDWARE_PORT_Win32 - -/******************************************************************************* - * Configuration Macro: TRC_CFG_RECORDER_MODE - * - * Specify what recording mode to use. Snapshot means that the data is saved in - * an internal RAM buffer, for later upload. Streaming means that the data is - * transferred continuously to the host PC. - * - * For more information, see http://percepio.com/2016/10/05/rtos-tracing/ - * and the Tracealyzer User Manual. - * - * Values: - * TRC_RECORDER_MODE_SNAPSHOT - * TRC_RECORDER_MODE_STREAMING - ******************************************************************************/ -#define TRC_CFG_RECORDER_MODE TRC_RECORDER_MODE_SNAPSHOT - -/******************************************************************************* - * Configuration Macro: TRC_CFG_RECORDER_BUFFER_ALLOCATION - * - * Specifies how the recorder buffer is allocated (also in case of streaming, in - * port using the recorder's internal temporary buffer) - * - * Values: - * TRC_RECORDER_BUFFER_ALLOCATION_STATIC - Static allocation (internal) - * TRC_RECORDER_BUFFER_ALLOCATION_DYNAMIC - Malloc in vTraceEnable - * TRC_RECORDER_BUFFER_ALLOCATION_CUSTOM - Use vTraceSetRecorderDataBuffer - * - * Static and dynamic mode does the allocation for you, either in compile time - * (static) or in runtime (malloc). - * The custom mode allows you to control how and where the allocation is made, - * for details see TRC_ALLOC_CUSTOM_BUFFER and vTraceSetRecorderDataBuffer(). - ******************************************************************************/ -#define TRC_CFG_RECORDER_BUFFER_ALLOCATION TRC_RECORDER_BUFFER_ALLOCATION_STATIC - -/****************************************************************************** - * TRC_CFG_FREERTOS_VERSION - * - * Specify what version of FreeRTOS that is used (don't change unless using the - * trace recorder library with an older version of FreeRTOS). - * - * TRC_FREERTOS_VERSION_7_3_OR_7_4 If using FreeRTOS v7.3.0 - v7.4.2 - * TRC_FREERTOS_VERSION_7_5_OR_7_6 If using FreeRTOS v7.5.0 - v7.6.0 - * TRC_FREERTOS_VERSION_8_X If using FreeRTOS v8.X.X - * TRC_FREERTOS_VERSION_9_X If using FreeRTOS v9.X.X - *****************************************************************************/ -#define TRC_CFG_FREERTOS_VERSION TRC_FREERTOS_VERSION_9_X - -/****************************************************************************** - * TRC_CFG_MAX_ISR_NESTING - * - * Defines how many levels of interrupt nesting the recorder can handle, in - * case multiple ISRs are traced and ISR nesting is possible. If this - * is exceeded, the particular ISR will not be traced and the recorder then - * logs an error message. This setting is used to allocate an internal stack - * for keeping track of the previous execution context (4 byte per entry). - * - * This value must be a non-zero positive constant, at least 1. - * - * Default value: 8 - *****************************************************************************/ -#define TRC_CFG_MAX_ISR_NESTING 8 - -/* Specific configuration, depending on Streaming/Snapshot mode */ -#if (TRC_CFG_RECORDER_MODE == TRC_RECORDER_MODE_SNAPSHOT) -#include "trcSnapshotConfig.h" -#elif (TRC_CFG_RECORDER_MODE == TRC_RECORDER_MODE_STREAMING) -#include "trcStreamingConfig.h" -#endif - -#ifdef __cplusplus -} -#endif - -#endif /* _TRC_CONFIG_H */ diff --git a/demos/infineon/xmc4800_iotkit/common/config_files/trcSnapshotConfig.h b/demos/infineon/xmc4800_iotkit/common/config_files/trcSnapshotConfig.h deleted file mode 100644 index 3119d4de439..00000000000 --- a/demos/infineon/xmc4800_iotkit/common/config_files/trcSnapshotConfig.h +++ /dev/null @@ -1,472 +0,0 @@ -/******************************************************************************* - * Trace Recorder Library for Tracealyzer v3.1.2 - * Percepio AB, www.percepio.com - * - * trcSnapshotConfig.h - * - * Configuration parameters for trace recorder library in snapshot mode. - * Read more at http://percepio.com/2016/10/05/rtos-tracing/ - * - * Terms of Use - * This file is part of the trace recorder library (RECORDER), which is the - * intellectual property of Percepio AB (PERCEPIO) and provided under a - * license as follows. - * The RECORDER may be used free of charge for the purpose of recording data - * intended for analysis in PERCEPIO products. It may not be used or modified - * for other purposes without explicit permission from PERCEPIO. - * You may distribute the RECORDER in its original source code form, assuming - * this text (terms of use, disclaimer, copyright notice) is unchanged. You are - * allowed to distribute the RECORDER with minor modifications intended for - * configuration or porting of the RECORDER, e.g., to allow using it on a - * specific processor, processor family or with a specific communication - * interface. Any such modifications should be documented directly below - * this comment block. - * - * Disclaimer - * The RECORDER is being delivered to you AS IS and PERCEPIO makes no warranty - * as to its use or performance. PERCEPIO does not and cannot warrant the - * performance or results you may obtain by using the RECORDER or documentation. - * PERCEPIO make no warranties, express or implied, as to noninfringement of - * third party rights, merchantability, or fitness for any particular purpose. - * In no event will PERCEPIO, its technology partners, or distributors be liable - * to you for any consequential, incidental or special damages, including any - * lost profits or lost savings, even if a representative of PERCEPIO has been - * advised of the possibility of such damages, or for any claim by any third - * party. Some jurisdictions do not allow the exclusion or limitation of - * incidental, consequential or special damages, or the exclusion of implied - * warranties or limitations on how long an implied warranty may last, so the - * above limitations may not apply to you. - * - * Tabs are used for indent in this file (1 tab = 4 spaces) - * - * Copyright Percepio AB, 2017. - * www.percepio.com - ******************************************************************************/ - -#ifndef TRC_SNAPSHOT_CONFIG_H -#define TRC_SNAPSHOT_CONFIG_H - -#define TRC_SNAPSHOT_MODE_RING_BUFFER ( 0x01 ) -#define TRC_SNAPSHOT_MODE_STOP_WHEN_FULL ( 0x02 ) - -/****************************************************************************** - * TRC_CFG_SNAPSHOT_MODE - * - * Macro which should be defined as one of: - * - TRC_SNAPSHOT_MODE_RING_BUFFER - * - TRC_SNAPSHOT_MODE_STOP_WHEN_FULL - * Default is TRC_SNAPSHOT_MODE_RING_BUFFER. - * - * With TRC_CFG_SNAPSHOT_MODE set to TRC_SNAPSHOT_MODE_RING_BUFFER, the - * events are stored in a ring buffer, i.e., where the oldest events are - * overwritten when the buffer becomes full. This allows you to get the last - * events leading up to an interesting state, e.g., an error, without having - * to store the whole run since startup. - * - * When TRC_CFG_SNAPSHOT_MODE is TRC_SNAPSHOT_MODE_STOP_WHEN_FULL, the - * recording is stopped when the buffer becomes full. This is useful for - * recording events following a specific state, e.g., the startup sequence. - *****************************************************************************/ -#define TRC_CFG_SNAPSHOT_MODE TRC_SNAPSHOT_MODE_RING_BUFFER - -/******************************************************************************* - * TRC_CFG_SCHEDULING_ONLY - * - * Macro which should be defined as an integer value. - * - * If this setting is enabled (= 1), only scheduling events are recorded. - * If disabled (= 0), all events are recorded. - * - * For users of Tracealyzer Free Edition, that only displays scheduling events, this - * option can be used to avoid storing other events. - * - * Default value is 0 (store all enabled events). - * - ******************************************************************************/ -#define TRC_CFG_SCHEDULING_ONLY 0 - -/******************************************************************************* - * TRC_CFG_EVENT_BUFFER_SIZE - * - * Macro which should be defined as an integer value. - * - * This defines the capacity of the event buffer, i.e., the number of records - * it may store. Most events use one record (4 byte), although some events - * require multiple 4-byte records. You should adjust this to the amount of RAM - * available in the target system. - * - * Default value is 1000, which means that 4000 bytes is allocated for the - * event buffer. - ******************************************************************************/ -#define TRC_CFG_EVENT_BUFFER_SIZE 15000 - -/******************************************************************************* - * TRC_CFG_NTASK, TRC_CFG_NISR, TRC_CFG_NQUEUE, TRC_CFG_NSEMAPHORE... - * - * A group of macros which should be defined as integer values, zero or larger. - * - * These define the capacity of the Object Property Table, i.e., the maximum - * number of objects active at any given point, within each object class (e.g., - * task, queue, semaphore, ...). - * - * If tasks or other objects are deleted in your system, this - * setting does not limit the total amount of objects created, only the number - * of objects that have been successfully created but not yet deleted. - * - * Using too small values will cause vTraceError to be called, which stores an - * error message in the trace that is shown when opening the trace file. The - * error message can also be retrieved using xTraceGetLastError. - * - * It can be wise to start with large values for these constants, - * unless you are very confident on these numbers. Then do a recording and - * check the actual usage by selecting View menu -> Trace Details -> - * Resource Usage -> Object Table. - ******************************************************************************/ -#define TRC_CFG_NTASK 150 -#define TRC_CFG_NISR 90 -#define TRC_CFG_NQUEUE 90 -#define TRC_CFG_NSEMAPHORE 90 -#define TRC_CFG_NMUTEX 90 -#define TRC_CFG_NTIMER 250 -#define TRC_CFG_NEVENTGROUP 90 - -/****************************************************************************** - * TRC_CFG_INCLUDE_MEMMANG_EVENTS - * - * Macro which should be defined as either zero (0) or one (1). - * - * This controls if malloc and free calls should be traced. Set this to zero (0) - * to exclude malloc/free calls, or one (1) to include such events in the trace. - * - * Default value is 1. - *****************************************************************************/ -#define TRC_CFG_INCLUDE_MEMMANG_EVENTS 1 - -/****************************************************************************** - * TRC_CFG_INCLUDE_USER_EVENTS - * - * Macro which should be defined as either zero (0) or one (1). - * - * If this is zero (0) the code for creating User Events is excluded to - * reduce code size. User Events are application-generated events, like - * "printf" but for the trace log and the formatting is done offline, by the - * Tracealyzer visualization tool. User Events are much faster than a printf - * and can therefore be used in timing critical code. - * - * Default value is 1. - *****************************************************************************/ -#define TRC_CFG_INCLUDE_USER_EVENTS 1 - -/***************************************************************************** -* TRC_CFG_INCLUDE_ISR_TRACING -* -* Macro which should be defined as either zero (0) or one (1). -* -* If this is zero (0), the code for recording Interrupt Service Routines is -* excluded, in order to reduce code size. -* -* Default value is 1. -* -* Note: tracing ISRs requires that you insert calls to vTraceStoreISRBegin -* and vTraceStoreISREnd in your interrupt handlers. -*****************************************************************************/ -#define TRC_CFG_INCLUDE_ISR_TRACING 1 - -/***************************************************************************** -* TRC_CFG_INCLUDE_READY_EVENTS -* -* Macro which should be defined as either zero (0) or one (1). -* -* If one (1), events are recorded when tasks enter scheduling state "ready". -* This allows Tracealyzer to show the initial pending time before tasks enter -* the execution state, and present accurate response times. -* If zero (0), "ready events" are not created, which allows for recording -* longer traces in the same amount of RAM. -* -* Default value is 1. -*****************************************************************************/ -#define TRC_CFG_INCLUDE_READY_EVENTS 1 - -/***************************************************************************** -* TRC_CFG_INCLUDE_OSTICK_EVENTS -* -* Macro which should be defined as either zero (0) or one (1). -* -* If this is one (1), events will be generated whenever the OS clock is -* increased. If zero (0), OS tick events are not generated, which allows for -* recording longer traces in the same amount of RAM. -* -* Default value is 0. -*****************************************************************************/ -#define TRC_CFG_INCLUDE_OSTICK_EVENTS 1 - -/****************************************************************************** - * TRC_CFG_INCLUDE_FLOAT_SUPPORT - * - * Macro which should be defined as either zero (0) or one (1). - * - * If this is zero (0), the support for logging floating point values in - * vTracePrintF is stripped out, in case floating point values are not used or - * supported by the platform used. - * - * Floating point values are only used in vTracePrintF and its subroutines, to - * allow for storing float (%f) or double (%lf) arguments. - * - * vTracePrintF can be used with integer and string arguments in either case. - * - * Default value is 0. - *****************************************************************************/ -#define TRC_CFG_INCLUDE_FLOAT_SUPPORT 0 - -/****************************************************************************** - * TRC_CFG_INCLUDE_OBJECT_DELETE - * - * Macro which should be defined as either zero (0) or one (1). - * - * This must be enabled (1) if tasks, queues or other - * traced kernel objects are deleted at runtime. If no deletes are made, this - * can be set to 0 in order to exclude the delete-handling code. - * - * Default value is 1. - *****************************************************************************/ -#define TRC_CFG_INCLUDE_OBJECT_DELETE 1 - -/******************************************************************************* - * TRC_CFG_SYMBOL_TABLE_SIZE - * - * Macro which should be defined as an integer value. - * - * This defines the capacity of the symbol table, in bytes. This symbol table - * stores User Events labels and names of deleted tasks, queues, or other kernel - * objects. If you don't use User Events or delete any kernel - * objects you set this to a very low value. The minimum recommended value is 4. - * A size of zero (0) is not allowed since a zero-sized array may result in a - * 32-bit pointer, i.e., using 4 bytes rather than 0. - * - * Default value is 800. - ******************************************************************************/ -#define TRC_CFG_SYMBOL_TABLE_SIZE 5000 - -#if ( TRC_CFG_SYMBOL_TABLE_SIZE == 0 ) - #error "TRC_CFG_SYMBOL_TABLE_SIZE may not be zero!" -#endif - -/****************************************************************************** - * TRC_CFG_NAME_LEN_TASK, TRC_CFG_NAME_LEN_QUEUE, ... - * - * Macros that specify the maximum lengths (number of characters) for names of - * kernel objects, such as tasks and queues. If longer names are used, they will - * be truncated when stored in the recorder. - *****************************************************************************/ -#define TRC_CFG_NAME_LEN_TASK 15 -#define TRC_CFG_NAME_LEN_ISR 15 -#define TRC_CFG_NAME_LEN_QUEUE 15 -#define TRC_CFG_NAME_LEN_SEMAPHORE 15 -#define TRC_CFG_NAME_LEN_MUTEX 15 -#define TRC_CFG_NAME_LEN_TIMER 15 -#define TRC_CFG_NAME_LEN_EVENTGROUP 15 - -/****************************************************************************** - *** ADVANCED SETTINGS ******************************************************** - ****************************************************************************** - * The remaining settings are not necessary to modify but allows for optimizing - * the recorder setup for your specific needs, e.g., to exclude events that you - * are not interested in, in order to get longer traces. - *****************************************************************************/ - -/****************************************************************************** -* TRC_CFG_HEAP_SIZE_BELOW_16M -* -* An integer constant that can be used to reduce the buffer usage of memory -* allocation events (malloc/free). This value should be 1 if the heap size is -* below 16 MB (2^24 byte), and you can live with reported addresses showing the -* lower 24 bits only. If 0, you get the full 32-bit addresses. -* -* Default value is 0. -******************************************************************************/ -#define TRC_CFG_HEAP_SIZE_BELOW_16M 0 - -/****************************************************************************** - * TRC_CFG_USE_IMPLICIT_IFE_RULES - * - * Macro which should be defined as either zero (0) or one (1). - * Default is 1. - * - * Tracealyzer groups the events into "instances" based on Instance Finish - * Events (IFEs), produced either by default rules or calls to the recorder - * functions vTraceInstanceFinishedNow and vTraceInstanceFinishedNext. - * - * If TRC_CFG_USE_IMPLICIT_IFE_RULES is one (1), the default IFE rules is - * used, resulting in a "typical" grouping of events into instances. - * If these rules don't give appropriate instances in your case, you can - * override the default rules using vTraceInstanceFinishedNow/Next for one - * or several tasks. The default IFE rules are then disabled for those tasks. - * - * If TRC_CFG_USE_IMPLICIT_IFE_RULES is zero (0), the implicit IFE rules are - * disabled globally. You must then call vTraceInstanceFinishedNow or - * vTraceInstanceFinishedNext to manually group the events into instances, - * otherwise the tasks will appear a single long instance. - * - * The default IFE rules count the following events as "instance finished": - * - Task delay, delay until - * - Task suspend - * - Blocking on "input" operations, i.e., when the task is waiting for the - * next a message/signal/event. But only if this event is blocking. - * - * For details, see trcSnapshotKernelPort.h and look for references to the - * macro trcKERNEL_HOOKS_SET_TASK_INSTANCE_FINISHED. - *****************************************************************************/ -#define TRC_CFG_USE_IMPLICIT_IFE_RULES 1 - -/****************************************************************************** - * TRC_CFG_USE_16BIT_OBJECT_HANDLES - * - * Macro which should be defined as either zero (0) or one (1). - * - * If set to 0 (zero), the recorder uses 8-bit handles to identify kernel - * objects such as tasks and queues. This limits the supported number of - * concurrently active objects to 255 of each type (tasks, queues, mutexes, - * etc.) Note: 255, not 256, since handle 0 is reserved. - * - * If set to 1 (one), the recorder uses 16-bit handles to identify kernel - * objects such as tasks and queues. This limits the supported number of - * concurrent objects to 65535 of each type (object class). However, since the - * object property table is limited to 64 KB, the practical limit is about - * 3000 objects in total. - * - * Default is 0 (8-bit handles) - * - * NOTE: An object with handle above 255 will use an extra 4-byte record in - * the event buffer whenever the object is referenced. Moreover, some internal - * tables in the recorder gets slightly larger when using 16-bit handles. - *****************************************************************************/ -#define TRC_CFG_USE_16BIT_OBJECT_HANDLES 0 - -/****************************************************************************** - * TRC_CFG_USE_TRACE_ASSERT - * - * Macro which should be defined as either zero (0) or one (1). - * Default is 1. - * - * If this is one (1), the TRACE_ASSERT macro (used at various locations in the - * trace recorder) will verify that a relevant condition is true. - * If the condition is false, prvTraceError() will be called, which stops the - * recording and stores an error message that is displayed when opening the - * trace in Tracealyzer. - * - * This is used on several places in the recorder code for sanity checks on - * parameters. Can be switched off to reduce the footprint of the tracing, but - * we recommend to have it enabled initially. - *****************************************************************************/ -#define TRC_CFG_USE_TRACE_ASSERT 1 - -/******************************************************************************* - * TRC_CFG_USE_SEPARATE_USER_EVENT_BUFFER - * - * Macro which should be defined as an integer value. - * - * Set TRC_CFG_USE_SEPARATE_USER_EVENT_BUFFER to 1 to enable the - * separate user event buffer (UB). - * In this mode, user events are stored separately from other events, - * e.g., RTOS events. Thereby you can get a much longer history of - * user events as they don't need to share the buffer space with more - * frequent events. - * - * The UB is typically used with the snapshot ring-buffer mode, so the - * recording can continue when the main buffer gets full. And since the - * main buffer then overwrites the earliest events, Tracealyzer displays - * "Unknown Actor" instead of task scheduling for periods with UB data only. - * - * In UB mode, user events are structured as UB channels, which contains - * a channel name and a default format string. Register a UB channel using - * xTraceRegisterUBChannel. - * - * Events and data arguments are written using vTraceUBEvent and - * vTraceUBData. They are designed to provide efficient logging of - * repeating events, using the same format string within each channel. - * - * Examples: - * - * traceString chn1 = xTraceRegisterString("Channel 1"); - * traceString fmt1 = xTraceRegisterString("Event!"); - * traceUBChannel UBCh1 = xTraceRegisterUBChannel(chn1, fmt1); - * - * traceString chn2 = xTraceRegisterString("Channel 2"); - * traceString fmt2 = xTraceRegisterString("X: %d, Y: %d"); - * traceUBChannel UBCh2 = xTraceRegisterUBChannel(chn2, fmt2); - * - * // Result in "[Channel 1] Event!" - * vTraceUBEvent(UBCh1); - * - * // Result in "[Channel 2] X: 23, Y: 19" - * vTraceUBData(UBCh2, 23, 19); - * - * You can also use the other user event functions, like vTracePrintF. - * as they are then rerouted to the UB instead of the main event buffer. - * vTracePrintF then looks up the correct UB channel based on the - * provided channel name and format string, or creates a new UB channel - * if no match is found. The format string should therefore not contain - * "random" messages but mainly format specifiers. Random strings should - * be stored using %s and with the string as an argument. - * - * // Creates a new UB channel ("Channel 2", "%Z: %d") - * vTracePrintF(chn2, "%Z: %d", value1); - * - * // Finds the existing UB channel - * vTracePrintF(chn2, "%Z: %d", value2); - * - ******************************************************************************/ -#define TRC_CFG_USE_SEPARATE_USER_EVENT_BUFFER 0 - -/******************************************************************************* - * TRC_CFG_SEPARATE_USER_EVENT_BUFFER_SIZE - * - * Macro which should be defined as an integer value. - * - * This defines the capacity of the user event buffer (UB), in number of slots. - * A single user event can use multiple slots, depending on the arguments. - * - * Only applicable if TRC_CFG_USE_SEPARATE_USER_EVENT_BUFFER is 1. - ******************************************************************************/ -#define TRC_CFG_SEPARATE_USER_EVENT_BUFFER_SIZE 200 - -/******************************************************************************* - * TRC_CFG_UB_CHANNELS - * - * Macro which should be defined as an integer value. - * - * This defines the number of User Event Buffer Channels (UB channels). - * These are used to structure the events when using the separate user - * event buffer, and contains both a User Event Channel (the name) and - * a default format string for the channel. - * - * Only applicable if TRC_CFG_USE_SEPARATE_USER_EVENT_BUFFER is 1. - ******************************************************************************/ -#define TRC_CFG_UB_CHANNELS 32 - -/******************************************************************************* - * TRC_CFG_ISR_TAILCHAINING_THRESHOLD - * - * Macro which should be defined as an integer value. - * - * If tracing multiple ISRs, this setting allows for accurate display of the - * context-switching also in cases when the ISRs execute in direct sequence. - * - * vTraceStoreISREnd normally assumes that the ISR returns to the previous - * context, i.e., a task or a preempted ISR. But if another traced ISR - * executes in direct sequence, Tracealyzer may incorrectly display a minimal - * fragment of the previous context in between the ISRs. - * - * By using TRC_CFG_ISR_TAILCHAINING_THRESHOLD you can avoid this. This is - * however a threshold value that must be measured for your specific setup. - * See http://percepio.com/2014/03/21/isr_tailchaining_threshold/ - * - * The default setting is 0, meaning "disabled" and that you may get an - * extra fragments of the previous context in between tail-chained ISRs. - * - * Note: This setting has separate definitions in trcSnapshotConfig.h and - * trcStreamingConfig.h, since it is affected by the recorder mode. - ******************************************************************************/ -#define TRC_CFG_ISR_TAILCHAINING_THRESHOLD 0 - -#endif /*TRC_SNAPSHOT_CONFIG_H*/ diff --git a/demos/infineon/xmc4800_iotkit/dave4/.cproject b/demos/infineon/xmc4800_iotkit/dave4/.cproject index a6612e4102a..f370f19b62d 100644 --- a/demos/infineon/xmc4800_iotkit/dave4/.cproject +++ b/demos/infineon/xmc4800_iotkit/dave4/.cproject @@ -1,121 +1,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/demos/infineon/xmc4800_iotkit/dave4/.gitignore b/demos/infineon/xmc4800_iotkit/dave4/.gitignore new file mode 100644 index 00000000000..1ead615febc --- /dev/null +++ b/demos/infineon/xmc4800_iotkit/dave4/.gitignore @@ -0,0 +1 @@ +Debug \ No newline at end of file diff --git a/demos/microchip/curiosity_pic32_bl/config_files/aws_boot_config.h b/demos/microchip/curiosity_pic32_bl/config_files/aws_boot_config.h index 55518a868ac..5d24f831bb1 100644 --- a/demos/microchip/curiosity_pic32_bl/config_files/aws_boot_config.h +++ b/demos/microchip/curiosity_pic32_bl/config_files/aws_boot_config.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS Demo Bootloader V1.4.2 + * Amazon FreeRTOS Demo Bootloader V1.4.3 * Copyright (C) 2018 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/demos/microchip/curiosity_pic32mzef/common/application_code/main.c b/demos/microchip/curiosity_pic32mzef/common/application_code/main.c index cd0b0aa21e3..0bb92471cdf 100644 --- a/demos/microchip/curiosity_pic32mzef/common/application_code/main.c +++ b/demos/microchip/curiosity_pic32mzef/common/application_code/main.c @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2017 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of @@ -36,6 +36,7 @@ /* AWS System includes. */ #include "aws_system_init.h" #include "aws_clientcredential.h" +#include "aws_dev_mode_key_provisioning.h" /* Demo application includes. */ #include "aws_demo_config.h" @@ -47,10 +48,11 @@ #include "aws_application_version.h" /* Declare the firmware version structure for all to see. */ -const AppVersion32_t xAppFirmwareVersion = { - .u.x.ucMajor = APP_VERSION_MAJOR, - .u.x.ucMinor = APP_VERSION_MINOR, - .u.x.usBuild = APP_VERSION_BUILD, +const AppVersion32_t xAppFirmwareVersion = +{ + .u.x.ucMajor = APP_VERSION_MAJOR, + .u.x.ucMinor = APP_VERSION_MINOR, + .u.x.usBuild = APP_VERSION_BUILD, }; /* Sleep on this platform */ @@ -171,6 +173,11 @@ void vApplicationIPNetworkEventHook( eIPCallbackEvent_t eNetworkEvent ) /* The network is up so we can run. */ if( ( SYSTEM_Init() == pdPASS ) && ( xTasksAlreadyCreated == pdFALSE ) ) { + /* A simple example to demonstrate key and certificate provisioning in + * microcontroller flash using PKCS#11 interface. This should be replaced + * by production ready key provisioning mechanism. */ + vDevModeKeyProvisioning(); + /* Run all demos. */ DEMO_RUNNER_RunDemos(); xTasksAlreadyCreated = pdTRUE; @@ -282,7 +289,7 @@ void vApplicationGetTimerTaskMemory( StaticTask_t ** ppxTimerTaskTCBBuffer, const char * pcApplicationHostnameHook( void ) { - /* This function will be called during the DHCP: the machine will be registered + /* This function will be called during the DHCP: the machine will be registered * with an IP address plus this name. */ return clientcredentialIOT_THING_NAME; } @@ -365,7 +372,10 @@ void vApplicationIdleHook( void ) void vApplicationMallocFailedHook() { taskDISABLE_INTERRUPTS(); - for( ;; ); + + for( ; ; ) + { + } } /*-----------------------------------------------------------*/ diff --git a/demos/microchip/curiosity_pic32mzef/common/config_files/aws_bufferpool_config.h b/demos/microchip/curiosity_pic32mzef/common/config_files/aws_bufferpool_config.h index 14a84ae380c..d0de9d72cca 100644 --- a/demos/microchip/curiosity_pic32mzef/common/config_files/aws_bufferpool_config.h +++ b/demos/microchip/curiosity_pic32mzef/common/config_files/aws_bufferpool_config.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2017 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/demos/microchip/curiosity_pic32mzef/common/config_files/aws_demo_config.h b/demos/microchip/curiosity_pic32mzef/common/config_files/aws_demo_config.h index 3508343be88..bb722be3da7 100644 --- a/demos/microchip/curiosity_pic32mzef/common/config_files/aws_demo_config.h +++ b/demos/microchip/curiosity_pic32mzef/common/config_files/aws_demo_config.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2017 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/demos/microchip/curiosity_pic32mzef/common/config_files/aws_ggd_config.h b/demos/microchip/curiosity_pic32mzef/common/config_files/aws_ggd_config.h index a2fbd1bbaf8..92c281e73eb 100644 --- a/demos/microchip/curiosity_pic32mzef/common/config_files/aws_ggd_config.h +++ b/demos/microchip/curiosity_pic32mzef/common/config_files/aws_ggd_config.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2017 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/demos/microchip/curiosity_pic32mzef/common/config_files/aws_mqtt_agent_config.h b/demos/microchip/curiosity_pic32mzef/common/config_files/aws_mqtt_agent_config.h index 87693210b2a..aeb1ee2fa40 100644 --- a/demos/microchip/curiosity_pic32mzef/common/config_files/aws_mqtt_agent_config.h +++ b/demos/microchip/curiosity_pic32mzef/common/config_files/aws_mqtt_agent_config.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2017 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/demos/microchip/curiosity_pic32mzef/common/config_files/aws_mqtt_config.h b/demos/microchip/curiosity_pic32mzef/common/config_files/aws_mqtt_config.h index 5c4f47cc82c..c9993fd84c5 100644 --- a/demos/microchip/curiosity_pic32mzef/common/config_files/aws_mqtt_config.h +++ b/demos/microchip/curiosity_pic32mzef/common/config_files/aws_mqtt_config.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2017 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/demos/microchip/curiosity_pic32mzef/common/config_files/aws_ota_agent_config.h b/demos/microchip/curiosity_pic32mzef/common/config_files/aws_ota_agent_config.h index 761ca6d0430..8b87de9a55b 100644 --- a/demos/microchip/curiosity_pic32mzef/common/config_files/aws_ota_agent_config.h +++ b/demos/microchip/curiosity_pic32mzef/common/config_files/aws_ota_agent_config.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2018 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/demos/microchip/curiosity_pic32mzef/common/config_files/aws_pkcs11_config.h b/demos/microchip/curiosity_pic32mzef/common/config_files/aws_pkcs11_config.h index 4fbbfac2c29..dcf5b1650cf 100644 --- a/demos/microchip/curiosity_pic32mzef/common/config_files/aws_pkcs11_config.h +++ b/demos/microchip/curiosity_pic32mzef/common/config_files/aws_pkcs11_config.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of @@ -32,12 +32,6 @@ #ifndef _AWS_PKCS11_CONFIG_H_ #define _AWS_PKCS11_CONFIG_H_ -/** - * @brief File storage location definitions. - */ -#define pkcs11configFILE_NAME_CLIENT_CERTIFICATE "FreeRTOS_P11_Certificate.dat" -#define pkcs11configFILE_NAME_KEY "FreeRTOS_P11_Key.dat" - /* A non-standard version of C_INITIALIZE should be used by this port. */ /* #define pkcs11configC_INITIALIZE_ALT */ diff --git a/demos/microchip/curiosity_pic32mzef/common/config_files/aws_secure_sockets_config.h b/demos/microchip/curiosity_pic32mzef/common/config_files/aws_secure_sockets_config.h index e2412297067..1283ee7307b 100644 --- a/demos/microchip/curiosity_pic32mzef/common/config_files/aws_secure_sockets_config.h +++ b/demos/microchip/curiosity_pic32mzef/common/config_files/aws_secure_sockets_config.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2017 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/demos/microchip/curiosity_pic32mzef/common/config_files/aws_shadow_config.h b/demos/microchip/curiosity_pic32mzef/common/config_files/aws_shadow_config.h index 4a8a79727c1..0ffa918b10d 100644 --- a/demos/microchip/curiosity_pic32mzef/common/config_files/aws_shadow_config.h +++ b/demos/microchip/curiosity_pic32mzef/common/config_files/aws_shadow_config.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2017 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/demos/microchip/curiosity_pic32mzef/common/config_files/aws_wifi_config.h b/demos/microchip/curiosity_pic32mzef/common/config_files/aws_wifi_config.h index 9f76f71c8b3..525d0b28cdf 100644 --- a/demos/microchip/curiosity_pic32mzef/common/config_files/aws_wifi_config.h +++ b/demos/microchip/curiosity_pic32mzef/common/config_files/aws_wifi_config.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2017 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/demos/microchip/curiosity_pic32mzef/mplab/nbproject/configurations.xml b/demos/microchip/curiosity_pic32mzef/mplab/nbproject/configurations.xml index 5e8b53ea5bc..149d55427f3 100644 --- a/demos/microchip/curiosity_pic32mzef/mplab/nbproject/configurations.xml +++ b/demos/microchip/curiosity_pic32mzef/mplab/nbproject/configurations.xml @@ -329,6 +329,7 @@ ../../../../lib/third_party/mbedtls/include/mbedtls/pk_internal.h ../../../../lib/third_party/mbedtls/include/mbedtls/platform.h ../../../../lib/third_party/mbedtls/include/mbedtls/platform_time.h + ../../../../lib/third_party/mbedtls/include/mbedtls/platform_util.h ../../../../lib/third_party/mbedtls/include/mbedtls/ripemd160.h ../../../../lib/third_party/mbedtls/include/mbedtls/rsa.h ../../../../lib/third_party/mbedtls/include/mbedtls/rsa_internal.h @@ -398,6 +399,7 @@ ../../../../lib/third_party/mbedtls/library/pkwrite.c ../../../../lib/third_party/mbedtls/library/pk_wrap.c ../../../../lib/third_party/mbedtls/library/platform.c + ../../../../lib/third_party/mbedtls/library/platform_util.c ../../../../lib/third_party/mbedtls/library/ripemd160.c ../../../../lib/third_party/mbedtls/library/rsa.c ../../../../lib/third_party/mbedtls/library/rsa_internal.c diff --git a/demos/nxp/lpc54018iotmodule/common/application_code/main.c b/demos/nxp/lpc54018iotmodule/common/application_code/main.c index 957a412a13b..842e3e50e5a 100644 --- a/demos/nxp/lpc54018iotmodule/common/application_code/main.c +++ b/demos/nxp/lpc54018iotmodule/common/application_code/main.c @@ -29,7 +29,7 @@ */ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2017 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/demos/nxp/lpc54018iotmodule/common/config_files/FreeRTOSConfig.h b/demos/nxp/lpc54018iotmodule/common/config_files/FreeRTOSConfig.h index 6607c8750ee..bf9d231a216 100644 --- a/demos/nxp/lpc54018iotmodule/common/config_files/FreeRTOSConfig.h +++ b/demos/nxp/lpc54018iotmodule/common/config_files/FreeRTOSConfig.h @@ -82,7 +82,7 @@ #define configUSE_TIMERS 1 #define configTIMER_TASK_PRIORITY ( configMAX_PRIORITIES - 3 ) #define configTIMER_QUEUE_LENGTH 10 -#define configTIMER_TASK_STACK_DEPTH ( configMINIMAL_STACK_SIZE * 4 ) +#define configTIMER_TASK_STACK_DEPTH ( configMINIMAL_STACK_SIZE * 6 ) /* Set the following definitions to 1 to include the API function, or zero * to exclude the API function. */ diff --git a/demos/nxp/lpc54018iotmodule/common/config_files/aws_bufferpool_config.h b/demos/nxp/lpc54018iotmodule/common/config_files/aws_bufferpool_config.h index 36a2288b059..7695cc3638d 100644 --- a/demos/nxp/lpc54018iotmodule/common/config_files/aws_bufferpool_config.h +++ b/demos/nxp/lpc54018iotmodule/common/config_files/aws_bufferpool_config.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2017 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/demos/nxp/lpc54018iotmodule/common/config_files/aws_demo_config.h b/demos/nxp/lpc54018iotmodule/common/config_files/aws_demo_config.h index 58b6b0dd6f4..e5864bb9bec 100644 --- a/demos/nxp/lpc54018iotmodule/common/config_files/aws_demo_config.h +++ b/demos/nxp/lpc54018iotmodule/common/config_files/aws_demo_config.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2017 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/demos/nxp/lpc54018iotmodule/common/config_files/aws_ggd_config.h b/demos/nxp/lpc54018iotmodule/common/config_files/aws_ggd_config.h index a2fbd1bbaf8..92c281e73eb 100644 --- a/demos/nxp/lpc54018iotmodule/common/config_files/aws_ggd_config.h +++ b/demos/nxp/lpc54018iotmodule/common/config_files/aws_ggd_config.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2017 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/demos/nxp/lpc54018iotmodule/common/config_files/aws_mqtt_agent_config.h b/demos/nxp/lpc54018iotmodule/common/config_files/aws_mqtt_agent_config.h index f418c2a75d9..75d4418aad9 100644 --- a/demos/nxp/lpc54018iotmodule/common/config_files/aws_mqtt_agent_config.h +++ b/demos/nxp/lpc54018iotmodule/common/config_files/aws_mqtt_agent_config.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2017 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/demos/nxp/lpc54018iotmodule/common/config_files/aws_mqtt_config.h b/demos/nxp/lpc54018iotmodule/common/config_files/aws_mqtt_config.h index 5c4f47cc82c..c9993fd84c5 100644 --- a/demos/nxp/lpc54018iotmodule/common/config_files/aws_mqtt_config.h +++ b/demos/nxp/lpc54018iotmodule/common/config_files/aws_mqtt_config.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2017 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/demos/nxp/lpc54018iotmodule/common/config_files/aws_pkcs11_config.h b/demos/nxp/lpc54018iotmodule/common/config_files/aws_pkcs11_config.h index f0c4587e84e..98f7fcf24e3 100644 --- a/demos/nxp/lpc54018iotmodule/common/config_files/aws_pkcs11_config.h +++ b/demos/nxp/lpc54018iotmodule/common/config_files/aws_pkcs11_config.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of @@ -32,9 +32,6 @@ #ifndef _AWS_PKCS11_CONFIG_H_ #define _AWS_PKCS11_CONFIG_H_ -#define pkcs11configFILE_NAME_CLIENT_CERTIFICATE "FreeRTOS_P11_Certificate.dat" -#define pkcs11configFILE_NAME_KEY "FreeRTOS_P11_Key.dat" - /* A non-standard version of C_INITIALIZE should be used by this port. */ #define pkcs11configC_INITIALIZE_ALT diff --git a/demos/nxp/lpc54018iotmodule/common/config_files/aws_secure_sockets_config.h b/demos/nxp/lpc54018iotmodule/common/config_files/aws_secure_sockets_config.h index d71f39f6c0e..99a512df44a 100644 --- a/demos/nxp/lpc54018iotmodule/common/config_files/aws_secure_sockets_config.h +++ b/demos/nxp/lpc54018iotmodule/common/config_files/aws_secure_sockets_config.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2017 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/demos/nxp/lpc54018iotmodule/common/config_files/aws_shadow_config.h b/demos/nxp/lpc54018iotmodule/common/config_files/aws_shadow_config.h index 4a8a79727c1..0ffa918b10d 100644 --- a/demos/nxp/lpc54018iotmodule/common/config_files/aws_shadow_config.h +++ b/demos/nxp/lpc54018iotmodule/common/config_files/aws_shadow_config.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2017 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/demos/nxp/lpc54018iotmodule/common/config_files/aws_wifi_config.h b/demos/nxp/lpc54018iotmodule/common/config_files/aws_wifi_config.h index edc8d0fa875..9b3660f193b 100644 --- a/demos/nxp/lpc54018iotmodule/common/config_files/aws_wifi_config.h +++ b/demos/nxp/lpc54018iotmodule/common/config_files/aws_wifi_config.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2017 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/demos/nxp/lpc54018iotmodule/iar/aws_demos.ewp b/demos/nxp/lpc54018iotmodule/iar/aws_demos.ewp index c8ff765aefb..f9c1eaf175b 100644 --- a/demos/nxp/lpc54018iotmodule/iar/aws_demos.ewp +++ b/demos/nxp/lpc54018iotmodule/iar/aws_demos.ewp @@ -1602,6 +1602,9 @@ $PROJ_DIR$\..\..\..\..\lib\third_party\mbedtls\include\mbedtls\platform_time.h + + $PROJ_DIR$\..\..\..\..\lib\third_party\mbedtls\include\mbedtls\platform_util.h + $PROJ_DIR$\..\..\..\..\lib\third_party\mbedtls\include\mbedtls\ripemd160.h @@ -1803,6 +1806,9 @@ $PROJ_DIR$\..\..\..\..\lib\third_party\mbedtls\library\platform.c + + $PROJ_DIR$\..\..\..\..\lib\third_party\mbedtls\library\platform_util.c + $PROJ_DIR$\..\..\..\..\lib\third_party\mbedtls\library\ripemd160.c diff --git a/demos/pc/windows/common/application_code/aws_demo_logging.c b/demos/pc/windows/common/application_code/aws_demo_logging.c index 6d3ad21cbd0..9fc7edb7ffd 100644 --- a/demos/pc/windows/common/application_code/aws_demo_logging.c +++ b/demos/pc/windows/common/application_code/aws_demo_logging.c @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2017 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/demos/pc/windows/common/application_code/aws_demo_logging.h b/demos/pc/windows/common/application_code/aws_demo_logging.h index 392c8610754..1223df96a88 100644 --- a/demos/pc/windows/common/application_code/aws_demo_logging.h +++ b/demos/pc/windows/common/application_code/aws_demo_logging.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2017 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/demos/pc/windows/common/application_code/aws_entropy_hardware_poll.c b/demos/pc/windows/common/application_code/aws_entropy_hardware_poll.c index c88a2f2c2db..5598f4a7d53 100644 --- a/demos/pc/windows/common/application_code/aws_entropy_hardware_poll.c +++ b/demos/pc/windows/common/application_code/aws_entropy_hardware_poll.c @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2017 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/demos/pc/windows/common/application_code/aws_run-time-stats-utils.c b/demos/pc/windows/common/application_code/aws_run-time-stats-utils.c index d09aa9bbfec..59bbd1df14a 100644 --- a/demos/pc/windows/common/application_code/aws_run-time-stats-utils.c +++ b/demos/pc/windows/common/application_code/aws_run-time-stats-utils.c @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2017 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/demos/pc/windows/common/application_code/main.c b/demos/pc/windows/common/application_code/main.c index c8ad62c5414..31a1179dd27 100644 --- a/demos/pc/windows/common/application_code/main.c +++ b/demos/pc/windows/common/application_code/main.c @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2017 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/demos/pc/windows/common/application_code/stdbool.h b/demos/pc/windows/common/application_code/stdbool.h index 683af135cb6..ceb86dde664 100644 --- a/demos/pc/windows/common/application_code/stdbool.h +++ b/demos/pc/windows/common/application_code/stdbool.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2017 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/demos/pc/windows/common/application_code/unistd.h b/demos/pc/windows/common/application_code/unistd.h index f617d810154..f2063a9d5de 100644 --- a/demos/pc/windows/common/application_code/unistd.h +++ b/demos/pc/windows/common/application_code/unistd.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2017 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/demos/pc/windows/common/config_files/aws_bufferpool_config.h b/demos/pc/windows/common/config_files/aws_bufferpool_config.h index 14a84ae380c..d0de9d72cca 100644 --- a/demos/pc/windows/common/config_files/aws_bufferpool_config.h +++ b/demos/pc/windows/common/config_files/aws_bufferpool_config.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2017 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/demos/pc/windows/common/config_files/aws_demo_config.h b/demos/pc/windows/common/config_files/aws_demo_config.h index 18e290af043..bda1070fe6c 100644 --- a/demos/pc/windows/common/config_files/aws_demo_config.h +++ b/demos/pc/windows/common/config_files/aws_demo_config.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2017 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/demos/pc/windows/common/config_files/aws_ggd_config.h b/demos/pc/windows/common/config_files/aws_ggd_config.h index a2fbd1bbaf8..92c281e73eb 100644 --- a/demos/pc/windows/common/config_files/aws_ggd_config.h +++ b/demos/pc/windows/common/config_files/aws_ggd_config.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2017 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/demos/pc/windows/common/config_files/aws_mqtt_agent_config.h b/demos/pc/windows/common/config_files/aws_mqtt_agent_config.h index 8eea8c5206d..d38b3cbf6c2 100644 --- a/demos/pc/windows/common/config_files/aws_mqtt_agent_config.h +++ b/demos/pc/windows/common/config_files/aws_mqtt_agent_config.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2017 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of @@ -42,7 +42,7 @@ * metric information will be included in the "username" field of * the MQTT connect messages. */ -#define mqttconfigENABLE_METRICS ( 1 ) +#define mqttconfigENABLE_METRICS ( 1 ) /** * @brief The maximum time interval in seconds allowed to elapse between 2 consecutive @@ -81,21 +81,26 @@ /** * @brief Maximum number of MQTT clients that can exist simultaneously. */ -#define mqttconfigMAX_BROKERS ( 4 ) +#define mqttconfigMAX_BROKERS ( 4 ) /** * @brief Maximum number of parallel operations per client. */ -#define mqttconfigMAX_PARALLEL_OPS ( 5 ) +#define mqttconfigMAX_PARALLEL_OPS ( 5 ) /** * @brief Time in milliseconds after which the TCP send operation should timeout. */ -#define mqttconfigTCP_SEND_TIMEOUT_MS ( 2000 ) +#define mqttconfigTCP_SEND_TIMEOUT_MS ( 2000 ) /** * @brief Length of the buffer used to receive data. */ -#define mqttconfigRX_BUFFER_SIZE ( 1024 + 128 ) +#define mqttconfigRX_BUFFER_SIZE ( 1024 + 128 ) + +/** + * @brief The maximum time in ticks for which the MQTT task is permitted to block. + */ +#define mqttconfigMQTT_TASK_MAX_BLOCK_TICKS ( ~( ( uint32_t ) 0 ) ) #endif /* _AWS_MQTT_AGENT_CONFIG_H_ */ diff --git a/demos/pc/windows/common/config_files/aws_mqtt_config.h b/demos/pc/windows/common/config_files/aws_mqtt_config.h index 644dde81325..67332079cf8 100644 --- a/demos/pc/windows/common/config_files/aws_mqtt_config.h +++ b/demos/pc/windows/common/config_files/aws_mqtt_config.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2017 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/demos/pc/windows/common/config_files/aws_ota_agent_config.h b/demos/pc/windows/common/config_files/aws_ota_agent_config.h index b690b868808..a20d829628f 100755 --- a/demos/pc/windows/common/config_files/aws_ota_agent_config.h +++ b/demos/pc/windows/common/config_files/aws_ota_agent_config.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2018 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/demos/pc/windows/common/config_files/aws_pkcs11_config.h b/demos/pc/windows/common/config_files/aws_pkcs11_config.h index ca26bbad6f9..97461232592 100644 --- a/demos/pc/windows/common/config_files/aws_pkcs11_config.h +++ b/demos/pc/windows/common/config_files/aws_pkcs11_config.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of @@ -32,9 +32,6 @@ #ifndef _AWS_PKCS11_CONFIG_H_ #define _AWS_PKCS11_CONFIG_H_ -#define pkcs11configFILE_NAME_CLIENT_CERTIFICATE "FreeRTOS_P11_Certificate.dat" -#define pkcs11configFILE_NAME_KEY "FreeRTOS_P11_Key.dat" - /* A non-standard version of C_INITIALIZE should be used by this port. */ /* #define pkcs11configC_INITIALIZE_ALT */ diff --git a/demos/pc/windows/common/config_files/aws_secure_sockets_config.h b/demos/pc/windows/common/config_files/aws_secure_sockets_config.h index d71f39f6c0e..99a512df44a 100644 --- a/demos/pc/windows/common/config_files/aws_secure_sockets_config.h +++ b/demos/pc/windows/common/config_files/aws_secure_sockets_config.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2017 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/demos/pc/windows/common/config_files/aws_shadow_config.h b/demos/pc/windows/common/config_files/aws_shadow_config.h index 4a8a79727c1..0ffa918b10d 100644 --- a/demos/pc/windows/common/config_files/aws_shadow_config.h +++ b/demos/pc/windows/common/config_files/aws_shadow_config.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2017 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/demos/pc/windows/visual_studio/aws_demos.vcxproj b/demos/pc/windows/visual_studio/aws_demos.vcxproj index 3035ee03591..41fe86874ff 100755 --- a/demos/pc/windows/visual_studio/aws_demos.vcxproj +++ b/demos/pc/windows/visual_studio/aws_demos.vcxproj @@ -181,6 +181,7 @@ + @@ -364,6 +365,7 @@ + @@ -421,9 +423,6 @@ - - - diff --git a/demos/pc/windows/visual_studio/aws_demos.vcxproj.filters b/demos/pc/windows/visual_studio/aws_demos.vcxproj.filters index 506ddb95f4f..1d70d29c763 100755 --- a/demos/pc/windows/visual_studio/aws_demos.vcxproj.filters +++ b/demos/pc/windows/visual_studio/aws_demos.vcxproj.filters @@ -564,6 +564,9 @@ lib\aws\defender\portable + + lib\third_party\mbedtls + @@ -1127,10 +1130,8 @@ lib\aws\defender\metrics + + lib\third_party\mbedtls\include\mbedtls + - - - lib\third_party\mbedtls - - - + \ No newline at end of file diff --git a/demos/st/stm32l475_discovery/common/application_code/main.c b/demos/st/stm32l475_discovery/common/application_code/main.c index bb890553b1f..ef4d34d6e35 100644 --- a/demos/st/stm32l475_discovery/common/application_code/main.c +++ b/demos/st/stm32l475_discovery/common/application_code/main.c @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2017 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/demos/st/stm32l475_discovery/common/config_files/FreeRTOSConfig.h b/demos/st/stm32l475_discovery/common/config_files/FreeRTOSConfig.h index 191e4970e5b..6b9fe7755b2 100644 --- a/demos/st/stm32l475_discovery/common/config_files/FreeRTOSConfig.h +++ b/demos/st/stm32l475_discovery/common/config_files/FreeRTOSConfig.h @@ -80,7 +80,7 @@ #define configUSE_TIMERS 1 #define configTIMER_TASK_PRIORITY ( configMAX_PRIORITIES - 2 ) #define configTIMER_QUEUE_LENGTH 10 -#define configTIMER_TASK_STACK_DEPTH ( configMINIMAL_STACK_SIZE * 4 ) +#define configTIMER_TASK_STACK_DEPTH ( configMINIMAL_STACK_SIZE * 6 ) /* Set the following definitions to 1 to include the API function, or zero * to exclude the API function. */ diff --git a/demos/st/stm32l475_discovery/common/config_files/aws_bufferpool_config.h b/demos/st/stm32l475_discovery/common/config_files/aws_bufferpool_config.h index 56379bd0ada..f4171a27b21 100644 --- a/demos/st/stm32l475_discovery/common/config_files/aws_bufferpool_config.h +++ b/demos/st/stm32l475_discovery/common/config_files/aws_bufferpool_config.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2017 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/demos/st/stm32l475_discovery/common/config_files/aws_demo_config.h b/demos/st/stm32l475_discovery/common/config_files/aws_demo_config.h index a8cf59e60be..e03ed94f84f 100644 --- a/demos/st/stm32l475_discovery/common/config_files/aws_demo_config.h +++ b/demos/st/stm32l475_discovery/common/config_files/aws_demo_config.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2017 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/demos/st/stm32l475_discovery/common/config_files/aws_ggd_config.h b/demos/st/stm32l475_discovery/common/config_files/aws_ggd_config.h index a2fbd1bbaf8..92c281e73eb 100644 --- a/demos/st/stm32l475_discovery/common/config_files/aws_ggd_config.h +++ b/demos/st/stm32l475_discovery/common/config_files/aws_ggd_config.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2017 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/demos/st/stm32l475_discovery/common/config_files/aws_mqtt_agent_config.h b/demos/st/stm32l475_discovery/common/config_files/aws_mqtt_agent_config.h index cdf452574b3..8e5db979007 100644 --- a/demos/st/stm32l475_discovery/common/config_files/aws_mqtt_agent_config.h +++ b/demos/st/stm32l475_discovery/common/config_files/aws_mqtt_agent_config.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2017 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/demos/st/stm32l475_discovery/common/config_files/aws_mqtt_config.h b/demos/st/stm32l475_discovery/common/config_files/aws_mqtt_config.h index 5c4f47cc82c..c9993fd84c5 100644 --- a/demos/st/stm32l475_discovery/common/config_files/aws_mqtt_config.h +++ b/demos/st/stm32l475_discovery/common/config_files/aws_mqtt_config.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2017 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/demos/st/stm32l475_discovery/common/config_files/aws_pkcs11_config.h b/demos/st/stm32l475_discovery/common/config_files/aws_pkcs11_config.h index 879b97add86..97461232592 100644 --- a/demos/st/stm32l475_discovery/common/config_files/aws_pkcs11_config.h +++ b/demos/st/stm32l475_discovery/common/config_files/aws_pkcs11_config.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of @@ -32,12 +32,6 @@ #ifndef _AWS_PKCS11_CONFIG_H_ #define _AWS_PKCS11_CONFIG_H_ -/** - * @brief File storage location definitions. - */ -#define pkcs11configFILE_NAME_CLIENT_CERTIFICATE "FreeRTOS_P11_Certificate.dat" -#define pkcs11configFILE_NAME_KEY "FreeRTOS_P11_Key.dat" - /* A non-standard version of C_INITIALIZE should be used by this port. */ /* #define pkcs11configC_INITIALIZE_ALT */ diff --git a/demos/st/stm32l475_discovery/common/config_files/aws_secure_sockets_config.h b/demos/st/stm32l475_discovery/common/config_files/aws_secure_sockets_config.h index e2412297067..1283ee7307b 100644 --- a/demos/st/stm32l475_discovery/common/config_files/aws_secure_sockets_config.h +++ b/demos/st/stm32l475_discovery/common/config_files/aws_secure_sockets_config.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2017 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/demos/st/stm32l475_discovery/common/config_files/aws_shadow_config.h b/demos/st/stm32l475_discovery/common/config_files/aws_shadow_config.h index 4a8a79727c1..0ffa918b10d 100644 --- a/demos/st/stm32l475_discovery/common/config_files/aws_shadow_config.h +++ b/demos/st/stm32l475_discovery/common/config_files/aws_shadow_config.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2017 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/demos/st/stm32l475_discovery/common/config_files/aws_wifi_config.h b/demos/st/stm32l475_discovery/common/config_files/aws_wifi_config.h index b43e34164c1..265b073e944 100644 --- a/demos/st/stm32l475_discovery/common/config_files/aws_wifi_config.h +++ b/demos/st/stm32l475_discovery/common/config_files/aws_wifi_config.h @@ -1,5 +1,5 @@ /* - * Amazon FreeRTOS V1.4.2 + * Amazon FreeRTOS V1.4.3 * Copyright (C) 2017 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/demos/ti/cc3220_launchpad/ccs/.cproject b/demos/ti/cc3220_launchpad/ccs/.cproject index 92f8e1e40cb..8a6b55f682f 100644 --- a/demos/ti/cc3220_launchpad/ccs/.cproject +++ b/demos/ti/cc3220_launchpad/ccs/.cproject @@ -57,7 +57,6 @@ -